@tricoteuses/senat 3.2.1 → 3.2.2

package/lib/src/server/ameli.js

@@ -1,6 +1,7 @@
 import { sql } from "kysely";
 import { jsonArrayFrom } from "kysely/helpers/postgres";
 import { db, streamRawQuery } from "./databases_postgres.js";
+import { normalizeMissionPlfLibelle, parseProgrammesPlf } from "../parsers/plf/amendement.js";
 export async function* findAllAmendements(fromSession) {
     const baseQuery = db
         .withSchema("senat")
@@ -9,6 +10,7 @@ export async function* findAllAmendements(fromSession) {
         .leftJoin("ameli_typsub as typsub", "typsub.id", "sub.typid")
         .leftJoin("ameli_typrect as typrect", "typrect.id", "amd.typrectid")
         .leftJoin("ameli_txt_ameli as txt_ameli", "txt_ameli.id", "amd.txtid")
+        .leftJoin("ameli_fbu as fbu", "fbu.id", "txt_ameli.fbuid")
         .leftJoin("ameli_etatxt as etatxt", "etatxt.id", "txt_ameli.txtetaid")
         .leftJoin("ameli_ses as ses", "ses.id", "txt_ameli.sesdepid")
         .leftJoin("ameli_typses as typses", "typses.id", "ses.typid")
@@ -35,6 +37,9 @@ export async function* findAllAmendements(fromSession) {
         "txt_ameli.numabs as numero_texte",
         "txt_ameli.numado as numero_adoption_texte",
         "txt_ameli.int as intitule_texte",
+        "fbu.id as mission_plf_id",
+        "fbu.lib as mission_plf_libelle",
+        "fbu.lic as mission_plf_libelle_court",
         "etatxt.lic as etat_texte",
         "etatxt.lib as etat_texte_libelle",
         "etatxt.txttyp as type_texte",
@@ -95,17 +100,17 @@ export async function* findAllAmendements(fromSession) {
         "avigvt.lib as avis_gouvernement",
         eb.fn.coalesce("sor.lib", "irr.libirr").as("sort"),
         "amd.rev as revision",
-        sql `
-        (
-          case
-            when ${eb.ref("amd.num")} like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
-            else 'https://www.senat.fr/amendements/'
-          end ||
-          ${eb.ref("ses.ann")}::text || '-' ||
-          (${eb.ref("ses.ann")}::integer + 1)::text || '/' ||
-          ${eb.ref("txt_ameli.numabs")} || '/Amdt_' ||
-          ${eb.ref("amd.num")} || '.html'
-        )
+        sql `
+        (
+          case
+            when ${eb.ref("amd.num")} like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
+            else 'https://www.senat.fr/amendements/'
+          end ||
+          ${eb.ref("ses.ann")}::text || '-' ||
+          (${eb.ref("ses.ann")}::integer + 1)::text || '/' ||
+          ${eb.ref("txt_ameli.numabs")} || '/Amdt_' ||
+          ${eb.ref("amd.num")} || '.html'
+        )
       `.as("url"),
         "grppol_ameli.lilcou as au_nom_de_groupe_politique",
         sql `coalesce(rtrim(${eb.ref("com_ameli.lil")}), ${eb.ref("org_lecass.orgnom")})`.as("au_nom_de_commission"),
@@ -147,6 +152,8 @@ export async function* findAllAmendements(fromSession) {
         yield {
             ...row,
             auteurs: row.auteurs ?? [],
+            mission_plf_libelle: normalizeMissionPlfLibelle(row.mission_plf_libelle),
+            programmes_plf: parseProgrammesPlf(row.dispositif),
         };
     }
 }

package/lib/src/server/conversion_textes.js

@@ -82,119 +82,119 @@ export async function convertSenatXmlToHtml(texteXml, outputFilePath) {
     }
     const metadata = extractMetadata(xmlDoc);
     const xmlBody = xmlDoc.querySelector("body");
-    const style = `
-body {
-  font-family: "URW Bookman", "Bookman Old Style", serif;
-  max-width: 800px;
-  margin: 40px auto;
-  line-height: 1.5;
-  color: #333;
-}
-.header {
-  text-align: center;
-  margin-bottom: 40px;
-  border-bottom: 2px solid #333;
-  padding-bottom: 20px;
-}
-.header-top {
-  font-weight: bold;
-  font-size: 1.2em;
-  margin-bottom: 10px;
-}
-.header-session {
-  text-transform: uppercase;
-  font-size: 0.9em;
-  margin-bottom: 5px;
-}
-.header-date {
-  font-size: 0.9em;
-  margin-bottom: 5px;
-}
-.header-number {
-  font-weight: bold;
-  font-size: 1.1em;
-  margin-bottom: 20px;
-}
-.header-type {
-  font-weight: bold;
-  font-size: 1.5em;
-  margin-top: 20px;
-}
-.header-authors {
-  margin-top: 20px;
-  font-style: italic;
-}
-.header-commission {
-  margin-top: 15px;
-  font-size: 0.9em;
-}
-h1 {
-  text-align: center;
-  font-size: 1.8em;
-  margin-top: 10px;
-}
-p {
-  margin: 0.6em 0;
-}
-p.has-alinea {
-  position: relative;
-  padding-left: 2.5em;
-}
-.alinea {
-  position: absolute;
-  left: 0;
-  top: 0.15em;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 1.5em;
-  height: 1.5em;
-  padding: 0 0.3em;
-  margin-right: 0.3em;
-  font-size: 0.75em;
-  font-weight: bold;
-  color: #555;
-  background-color: #f0f0f0;
-  border: 1px solid #ccc;
-  border-radius: 1em;
-}
-.num {
-  font-weight: bold;
-  margin-right: 0.2em;
-}
-.article {
-  margin-top: 2em;
-}
-.article h3 {
-  border-bottom: 1px solid #eee;
-  padding-bottom: 5px;
-}
+    const style = `
+body {
+  font-family: "URW Bookman", "Bookman Old Style", serif;
+  max-width: 800px;
+  margin: 40px auto;
+  line-height: 1.5;
+  color: #333;
+}
+.header {
+  text-align: center;
+  margin-bottom: 40px;
+  border-bottom: 2px solid #333;
+  padding-bottom: 20px;
+}
+.header-top {
+  font-weight: bold;
+  font-size: 1.2em;
+  margin-bottom: 10px;
+}
+.header-session {
+  text-transform: uppercase;
+  font-size: 0.9em;
+  margin-bottom: 5px;
+}
+.header-date {
+  font-size: 0.9em;
+  margin-bottom: 5px;
+}
+.header-number {
+  font-weight: bold;
+  font-size: 1.1em;
+  margin-bottom: 20px;
+}
+.header-type {
+  font-weight: bold;
+  font-size: 1.5em;
+  margin-top: 20px;
+}
+.header-authors {
+  margin-top: 20px;
+  font-style: italic;
+}
+.header-commission {
+  margin-top: 15px;
+  font-size: 0.9em;
+}
+h1 {
+  text-align: center;
+  font-size: 1.8em;
+  margin-top: 10px;
+}
+p {
+  margin: 0.6em 0;
+}
+p.has-alinea {
+  position: relative;
+  padding-left: 2.5em;
+}
+.alinea {
+  position: absolute;
+  left: 0;
+  top: 0.15em;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 1.5em;
+  height: 1.5em;
+  padding: 0 0.3em;
+  margin-right: 0.3em;
+  font-size: 0.75em;
+  font-weight: bold;
+  color: #555;
+  background-color: #f0f0f0;
+  border: 1px solid #ccc;
+  border-radius: 1em;
+}
+.num {
+  font-weight: bold;
+  margin-right: 0.2em;
+}
+.article {
+  margin-top: 2em;
+}
+.article h3 {
+  border-bottom: 1px solid #eee;
+  padding-bottom: 5px;
+}
 `;
-    const htmlDocTemplate = `<!DOCTYPE html>
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>${metadata.title || "Document Sénat"}</title>
-  <style>${style}</style>
-</head>
-<body>
-  <div class="header">
-    <div class="header-top">SÉNAT</div>
-    <div class="header-session">SESSION ORDINAIRE DE ${metadata.session || "...."}</div>
-    ${metadata.date ? `<div class="header-date">Enregistré à la Présidence du Sénat le ${metadata.date}</div>` : ""}
-    <div class="header-number">N° ${metadata.number || "...."}</div>
-    <div class="header-type">${metadata.type || ""}</div>
-    <div class="header-authors">${metadata.authors || ""}</div>
+    const htmlDocTemplate = `<!DOCTYPE html>
+<html lang="fr">
+<head>
+  <meta charset="utf-8">
+  <title>${metadata.title || "Document Sénat"}</title>
+  <style>${style}</style>
+</head>
+<body>
+  <div class="header">
+    <div class="header-top">SÉNAT</div>
+    <div class="header-session">SESSION ORDINAIRE DE ${metadata.session || "...."}</div>
+    ${metadata.date ? `<div class="header-date">Enregistré à la Présidence du Sénat le ${metadata.date}</div>` : ""}
+    <div class="header-number">N° ${metadata.number || "...."}</div>
+    <div class="header-type">${metadata.type || ""}</div>
+    <div class="header-authors">${metadata.authors || ""}</div>
     ${metadata.commission
         ? [
             `<div class="header-commission">Envoyée à la ${metadata.commission.toLowerCase()},`,
             "sous réserve de la constitution éventuelle d'une commission spéciale dans les conditions prévues",
             "par le Règlement.</div>",
         ].join(" ")
-        : ""}
-  </div>
-  <h1>${metadata.title || ""}</h1>
-</body>
+        : ""}
+  </div>
+  <h1>${metadata.title || ""}</h1>
+</body>
 </html>`;
     const { document: htmlDoc } = new JSDOM(htmlDocTemplate).window;
     const body = htmlDoc.body;

package/lib/src/server/datasets.js

@@ -43,6 +43,7 @@ export const datasets = {
             typrect: [{ name: "idx_id", columns: ["id"] }],
             txt_ameli: [
                 { name: "idx_id", columns: ["id"] },
+                { name: "idx_fbuid", columns: ["fbuid"] },
                 { name: "idx_txtetaid", columns: ["txtetaid"] },
                 { name: "idx_sesdepid", columns: ["sesdepid"] },
                 { name: "idx_natid", columns: ["natid"] },

package/lib/src/server/debats.js

@@ -33,11 +33,11 @@ export async function* findAll() {
                 "intpjl.intfon as fonction_intervenant",
                 "intpjl.inturl as url",
                 "intpjl.intana as analyse",
-                sql `json_build_object(
-                    'code', auteur.autcod,
-                    'nom', auteur.nomuse,
-                    'prenom', auteur.prenom,
-                    'matricule', auteur.autmat
+                sql `json_build_object(
+                    'code', auteur.autcod,
+                    'nom', auteur.nomuse,
+                    'prenom', auteur.prenom,
+                    'matricule', auteur.autmat
                   )`.as("auteur"),
             ])
                 .whereRef("intpjl.secdiscle", "=", "secdis.secdiscle")
@@ -64,11 +64,11 @@ export async function* findAll() {
                 "intdivers.intfon as fonction_intervenant",
                 "intdivers.inturl as url",
                 "intdivers.intana as analyse",
-                sql `json_build_object(
-                    'code', auteur.autcod,
-                    'nom', auteur.nomuse,
-                    'prenom', auteur.prenom,
-                    'matricule', auteur.autmat
+                sql `json_build_object(
+                    'code', auteur.autcod,
+                    'nom', auteur.nomuse,
+                    'prenom', auteur.prenom,
+                    'matricule', auteur.autmat
                   )`.as("auteur"),
             ])
                 .whereRef("intdivers.secdiverscle", "=", "secdivers.secdiverscle")

package/lib/src/server/documents.js

@@ -14,18 +14,18 @@ export async function* findAllTextes() {
         "loi.signet as signet_dossier",
         "texte.texnum as numero",
         "texte.orgcod as code_organisme",
-        sql `
-        case
-          when ${eb.ref("texte.texurl")} is not null then
-            regexp_replace(regexp_replace(trim(${eb.ref("texte.texurl")}), '#+$', ''), '^(.*/)?(.*?)(\\.html)?$', '\\2')
-          else null
-        end
+        sql `
+        case
+          when ${eb.ref("texte.texurl")} is not null then
+            regexp_replace(regexp_replace(trim(${eb.ref("texte.texurl")}), '#+$', ''), '^(.*/)?(.*?)(\\.html)?$', '\\2')
+          else null
+        end
       `.as("id"),
-        sql `
-        case
-          when ${eb.ref("texte.typurl")} = 'I' then regexp_replace('https://www.senat.fr/leg/' || rtrim(${eb.ref("texte.texurl")}), '#+$', '')
-          else regexp_replace(rtrim(${eb.ref("texte.texurl")}), '#+$', '')
-        end
+        sql `
+        case
+          when ${eb.ref("texte.typurl")} = 'I' then regexp_replace('https://www.senat.fr/leg/' || rtrim(${eb.ref("texte.texurl")}), '#+$', '')
+          else regexp_replace(rtrim(${eb.ref("texte.texurl")}), '#+$', '')
+        end
       `.as("url"),
         sql `rtrim(${eb.ref("oritxt.oritxtlib")})`.as("origine"),
         "oritxt.oriordre as ordre_origine",
@@ -74,18 +74,18 @@ export async function* findAllRapports() {
         "loi.signet as signet_dossier",
         "rap.rapnum as numero",
         "raporg.orgcod as code_organisme",
-        sql `
-        case
-          when ${eb.ref("rap.rapurl")} is not null then
-            regexp_replace(regexp_replace(trim(${eb.ref("rap.rapurl")}), '#+$', ''), '^(.*/)?(.*?)(\\.html)?$', '\\2')
-          else null
-        end
+        sql `
+        case
+          when ${eb.ref("rap.rapurl")} is not null then
+            regexp_replace(regexp_replace(trim(${eb.ref("rap.rapurl")}), '#+$', ''), '^(.*/)?(.*?)(\\.html)?$', '\\2')
+          else null
+        end
       `.as("id"),
-        sql `
-        case
-          when ${eb.ref("rap.typurl")} = 'I' then regexp_replace('https://www.senat.fr/rap/' || rtrim(${eb.ref("rap.rapurl")}), '#+$', '')
-          else regexp_replace(rtrim(${eb.ref("rap.rapurl")}), '#+$', '')
-        end
+        sql `
+        case
+          when ${eb.ref("rap.typurl")} = 'I' then regexp_replace('https://www.senat.fr/rap/' || rtrim(${eb.ref("rap.rapurl")}), '#+$', '')
+          else regexp_replace(rtrim(${eb.ref("rap.rapurl")}), '#+$', '')
+        end
       `.as("url"),
         sql `rtrim(${eb.ref("denrap.libdenrap")})`.as("type"),
         sql `rtrim(rtrim(${eb.ref("rap.raptil")}))`.as("titre"),

package/lib/src/server/dosleg.js

@@ -39,13 +39,13 @@ export async function* findAllDossiers() {
         sql `to_char(${eb.ref("loi.proaccoppdat")}, 'YYYY-MM-DD')`.as("date_opposition_procedure_acceleree"),
         sql `to_char(${eb.ref("loi.retproaccdat")}, 'YYYY-MM-DD')`.as("date_retrait_procedure_acceleree"),
         sql `to_char(${eb.ref("loi.date_loi")}, 'YYYY-MM-DD')`.as("date_promulgation"),
-        sql `
-        case
-          when ${eb.ref("loi.loititjo")} is not null
-            then rtrim(${eb.ref("typloi.typloiden")})
-              || ' ' || rtrim(${eb.ref("loi.loititjo")})
-          else ''
-        end
+        sql `
+        case
+          when ${eb.ref("loi.loititjo")} is not null
+            then rtrim(${eb.ref("typloi.typloiden")})
+              || ' ' || rtrim(${eb.ref("loi.loititjo")})
+          else ''
+        end
       `.as("titre_JO"),
         sql `to_char(${eb.ref("loi.loidatjo")}, 'YYYY-MM-DD')`.as("date_publication_JO"),
         "loi.loinumjo as numero_JO",
@@ -118,20 +118,20 @@ export async function* findAllDossiers() {
                     .select((eb4) => [
                     "texte.texnum as numero",
                     "texte.orgcod as code_organisme",
-                    sql `
-                          case
-                            when texte.texurl is not null then
-                              regexp_replace(
-                                regexp_replace(trim(texte.texurl), '#+$', ''),
-                                '^(.*/)?(.*?)(\.html)?$', '\\2')
-                            else null
-                          end
+                    sql `
+                          case
+                            when texte.texurl is not null then
+                              regexp_replace(
+                                regexp_replace(trim(texte.texurl), '#+$', ''),
+                                '^(.*/)?(.*?)(\.html)?$', '\\2')
+                            else null
+                          end
                         `.as("id"),
-                    sql `
-                          case
-                            when texte.typurl = 'I' then regexp_replace('https://www.senat.fr/leg/' || rtrim(texte.texurl), '#+$', '')
-                            else regexp_replace(rtrim(texte.texurl), '#+$', '')
-                          end
+                    sql `
+                          case
+                            when texte.typurl = 'I' then regexp_replace('https://www.senat.fr/leg/' || rtrim(texte.texurl), '#+$', '')
+                            else regexp_replace(rtrim(texte.texurl), '#+$', '')
+                          end
                         `.as("url"),
                     sql `rtrim(oritxt.oritxtlib)`.as("origine"),
                     "oritxt.oriordre as ordre_origine",
@@ -181,20 +181,20 @@ export async function* findAllDossiers() {
                     .select((eb4) => [
                     "rap.rapnum as numero",
                     "raporg.orgcod as code_organisme",
-                    sql `
-                          case
-                            when rap.rapurl is not null then
-                              regexp_replace(
-                                regexp_replace(trim(rap.rapurl), '#+$', ''),
-                                '^(.*/)?(.*?)(\.html)?$', '\\2')
-                            else null
-                          end
+                    sql `
+                          case
+                            when rap.rapurl is not null then
+                              regexp_replace(
+                                regexp_replace(trim(rap.rapurl), '#+$', ''),
+                                '^(.*/)?(.*?)(\.html)?$', '\\2')
+                            else null
+                          end
                         `.as("id"),
-                    sql `
-                          case
-                            when rap.typurl = 'I' then regexp_replace('https://www.senat.fr/rap/' || rtrim(rap.rapurl), '#+$', '')
-                            else regexp_replace(rtrim(rap.rapurl), '#+$', '')
-                          end
+                    sql `
+                          case
+                            when rap.typurl = 'I' then regexp_replace('https://www.senat.fr/rap/' || rtrim(rap.rapurl), '#+$', '')
+                            else regexp_replace(rtrim(rap.rapurl), '#+$', '')
+                          end
                         `.as("url"),
                     sql `rtrim(denrap.libdenrap)`.as("type"),
                     sql `rtrim(rtrim(rap.raptil))`.as("titre"),

package/lib/src/server/questions.js

@@ -50,16 +50,16 @@ export async function* findAll() {
         "etatquestion.etaquecod as etat_code",
         sql `${eb.ref("etatquestion.etaquenumtri")}::text`.as("etat_tri"),
         // Thèmes (extraits par regexp depuis la colonne themes)
-        sql `(
-        select coalesce(json_agg(theme_rows.libelle order by theme_rows.theme_order nulls last), '[]'::json)
-        from (
-          select
-            the.thelib as libelle,
-            the.thenouidt as theme_order
-          from regexp_matches(coalesce(${eb.ref("tam_questions.themes")}, ''), '#(\\d+)', 'g') as matches(match)
-          join senat.questions_the as the on the.thenouidt::text = matches.match[1]
-          order by the.thenouidt asc
-        ) as theme_rows
+        sql `(
+        select coalesce(json_agg(theme_rows.libelle order by theme_rows.theme_order nulls last), '[]'::json)
+        from (
+          select
+            the.thelib as libelle,
+            the.thenouidt as theme_order
+          from regexp_matches(coalesce(${eb.ref("tam_questions.themes")}, ''), '#(\\d+)', 'g') as matches(match)
+          join senat.questions_the as the on the.thenouidt::text = matches.match[1]
+          order by the.thenouidt asc
+        ) as theme_rows
       )`.as("themes"),
         // Réponses
         jsonArrayFrom(eb

package/lib/src/server/scrutins.js

@@ -69,9 +69,9 @@ export async function* findAllScrutins(fromSession) {
             "posvot.posvotlib",
             "stavot.stavotlib",
             "memgrppol.grppolcod",
-            sql `row_number() over (
-                  partition by votsen.senmat, votsen.scrnum, votsen.sesann
-                  order by memgrppol.memgrppoldatdeb desc nulls last
+            sql `row_number() over (
+                  partition by votsen.senmat, votsen.scrnum, votsen.sesann
+                  order by memgrppol.memgrppoldatdeb desc nulls last
                 )`.as("vote_rank"),
         ])
             .whereRef("votsen.scrnum", "=", "scr.scrnum")

package/lib/src/server/sens.js

@@ -78,9 +78,9 @@ export async function* findAll() {
                 .select([
                 sql `to_char(fonmemcom.fonmemcomdatdeb, 'YYYY-MM-DD')`.as("date_debut"),
                 sql `to_char(fonmemcom.fonmemcomdatfin, 'YYYY-MM-DD')`.as("date_fin"),
-                sql `coalesce(
-                    nullif(trim(foncom.foncomlib), ''),
-                    nullif(trim(foncom.foncomlil), ''),
+                sql `coalesce(
+                    nullif(trim(foncom.foncomlib), ''),
+                    nullif(trim(foncom.foncomlil), ''),
                     nullif(trim(foncom.foncomlic), ''))`.as("libelle"),
                 "fonmemcom.fonmemcomdatdeb as order_date",
             ])
@@ -111,9 +111,9 @@ export async function* findAll() {
                 .select([
                 sql `to_char(fonmemdelega.fonmemdeldatdeb, 'YYYY-MM-DD')`.as("date_debut"),
                 sql `to_char(fonmemdelega.fonmemdeldatfin, 'YYYY-MM-DD')`.as("date_fin"),
-                sql `coalesce(
-                      nullif(trim(fondelega.fondellib), ''),
-                      nullif(trim(fondelega.fondellil), ''),
+                sql `coalesce(
+                      nullif(trim(fondelega.fondellib), ''),
+                      nullif(trim(fondelega.fondellil), ''),
                       nullif(trim(fondelega.fondellic), ''))`.as("libelle"),
                 "fonmemdelega.fonmemdeldatdeb as order_date",
             ])
@@ -144,9 +144,9 @@ export async function* findAll() {
                 .select([
                 sql `to_char(fonmemgrppol.fonmemgrppoldatdeb, 'YYYY-MM-DD')`.as("date_debut"),
                 sql `to_char(fonmemgrppol.fonmemgrppoldatfin, 'YYYY-MM-DD')`.as("date_fin"),
-                sql `coalesce(
-                    nullif(trim(fongrppol.fongrppollib), ''),
-                    nullif(trim(fongrppol.fongrppollil), ''),
+                sql `coalesce(
+                    nullif(trim(fongrppol.fongrppollib), ''),
+                    nullif(trim(fongrppol.fongrppollil), ''),
                     nullif(trim(fongrppol.fongrppollic), ''))`.as("libelle"),
                 "fonmemgrppol.fonmemgrppoldatdeb as order_date",
             ])
@@ -176,9 +176,9 @@ export async function* findAll() {
                 .select([
                 sql `to_char(fonmemorg.fonmemorgdatdeb, 'YYYY-MM-DD')`.as("date_debut"),
                 sql `to_char(fonmemorg.fonmemorgdatfin, 'YYYY-MM-DD')`.as("date_fin"),
-                sql `coalesce(
-                      nullif(trim(fonorg.fonorglib), ''),
-                      nullif(trim(fonorg.fonorglil), ''),
+                sql `coalesce(
+                      nullif(trim(fonorg.fonorglib), ''),
+                      nullif(trim(fonorg.fonorglil), ''),
                       nullif(trim(fonorg.fonorglic), ''))`.as("libelle"),
                 "fonmemorg.fonmemorgdatdeb as order_date",
             ])
@@ -224,9 +224,9 @@ export async function* findAll() {
                 .select([
                 sql `to_char(fonmemgrpsen.fonmemgrpsendatdeb, 'YYYY-MM-DD')`.as("date_debut"),
                 sql `to_char(fonmemgrpsen.fonmemgrpsendatfin, 'YYYY-MM-DD')`.as("date_fin"),
-                sql `coalesce(
-                    nullif(trim(fongrpsen.fongrpsenlib), ''),
-                    nullif(trim(fongrpsen.fongrpsenlil), ''),
+                sql `coalesce(
+                    nullif(trim(fongrpsen.fongrpsenlib), ''),
+                    nullif(trim(fongrpsen.fongrpsenlil), ''),
                     nullif(trim(fongrpsen.fongrpsenlic), ''))`.as("libelle"),
                 "fonmemgrpsen.fonmemgrpsendatdeb as order_date",
             ])
@@ -241,10 +241,10 @@ export async function* findAll() {
             .select([
             sql `to_char(senbur.senburdatdeb, 'YYYY-MM-DD')`.as("date_debut"),
             sql `to_char(senbur.senburdatfin, 'YYYY-MM-DD')`.as("date_fin"),
-            sql `coalesce(
-              nullif(btrim(bur.burlib), ''),
-              nullif(btrim(bur.burlil), ''),
-              nullif(btrim(bur.burlic), '')
+            sql `coalesce(
+              nullif(btrim(bur.burlib), ''),
+              nullif(btrim(bur.burlil), ''),
+              nullif(btrim(bur.burlic), '')
             )`.as("libelle"),
             "senbur.senburdatdeb as order_date",
         ])

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/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 {};