@tricoteuses/senat 2.22.16 → 2.23.0

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

@@ -1,55 +1,67 @@
-import { InferResult } from "kysely";
-export type AmendementResult = InferResult<typeof findAllAmendementsQuery>[0];
-declare const findAllAmendementsQuery: import("kysely").SelectQueryBuilder<{
-    [x: string]: any;
-    [x: number]: any;
-    [x: symbol]: any;
-}, "ameli.amd" | "ameli.sub" | "ameli.typsub" | "ameli.typrect" | "ameli.txt_ameli" | "ameli.etatxt" | "ameli.ses" | "ameli.typses" | "ameli.nat" | "ameli.lec_ameli" | "dosleg.texte" | "dosleg.lecass" | "ameli.mot" | "ameli.avicom" | "ameli.avigvt" | "ameli.sor" | "ameli.irr" | "ameli.grppol_ameli" | "ameli.com_ameli" | "ameli.cab", {
-    [x: string]: any;
-    nature: string;
-    date_depot: string;
-    etat: string;
-    sort: any;
-    url: string;
-    au_nom_de_commission: string;
-    code_commission: string;
+export interface AmendementAuteurRow {
+    group_politique_code: string | null;
+    groupe_politique_id: number | null;
+    groupe_politique_libelle: string | null;
+    groupe_politique_libelle_court: string | null;
+    homonyme: string | null;
+    matricule: string | null;
+    nom: string | null;
+    prenom: string | null;
+    qualite: string | null;
+    rang: string | null;
+}
+export interface AmendementResult {
+    accepte_gouvernement: string | null;
+    alinea: number | null;
     auteur_est_gouvernement: boolean;
-    scrutin_num: any;
-    auteurs: {
-        prenom: any;
-        homonyme: any;
-        nom: any;
-        qualite: any;
-        rang: any;
-        matricule: any;
-        groupe_politique_id: any;
-        group_politique_code: any;
-        groupe_politique_libelle_court: any;
-        groupe_politique_libelle: any;
-    }[];
-}>;
-export declare function findAllAmendements(fromSession?: number): AsyncIterableIterator<{
-    [x: string]: any;
-    nature: string;
-    date_depot: string;
+    au_nom_de_commission: string | null;
+    au_nom_de_groupe_politique: string | null;
+    auteurs: AmendementAuteurRow[];
+    avis_commission: string | null;
+    avis_gouvernement: string | null;
+    code_commission: string | null;
+    date_depot: string | null;
+    discussion_commune_id: number | null;
+    dispositif: string | null;
     etat: string;
-    sort: any;
+    etat_texte: string | null;
+    etat_texte_libelle: string | null;
+    id: number;
+    identique_id: number | null;
+    intitule_texte: string | null;
+    lecture: string | null;
+    motion_libelle: string | null;
+    nature: string;
+    nature_texte: string | null;
+    nature_texte_libelle: string | null;
+    numero: string;
+    numero_absolu: string | null;
+    numero_adoption_texte: string | null;
+    numero_texte: string | null;
+    objet: string | null;
+    observations: string | null;
+    observations_additionnelles: string | null;
+    ordre: number | null;
+    parent_id: number | null;
+    revision: string | null;
+    session: string;
+    session_libelle: string;
+    signet_dossier_legislatif: string | null;
+    sort: string | null;
+    scrutin_num: string | null;
+    subdivision_commission_id: number | null;
+    subdivision_dupliquee: string | null;
+    subdivision_libelle: string | null;
+    subdivision_libelle_court: string | null;
+    subdivision_mere_id: number | null;
+    subdivision_position_discussion: number | null;
+    subdivision_position_texte: number | null;
+    subdivision_signet: string | null;
+    subdivision_type: string | null;
+    texte_id: number | null;
+    type_rectification: string | null;
+    type_session: string | null;
+    type_texte: string | null;
     url: string;
-    au_nom_de_commission: string;
-    code_commission: string;
-    auteur_est_gouvernement: boolean;
-    scrutin_num: any;
-    auteurs: {
-        prenom: any;
-        homonyme: any;
-        nom: any;
-        qualite: any;
-        rang: any;
-        matricule: any;
-        groupe_politique_id: any;
-        group_politique_code: any;
-        groupe_politique_libelle_court: any;
-        groupe_politique_libelle: any;
-    }[];
-}>;
-export {};
+}
+export declare function findAllAmendements(fromSession?: number): AsyncGenerator<AmendementResult, void, unknown>;

package/lib/src/model/ameli.js

@@ -1,148 +1,150 @@
-import { sql } from "kysely";
-import { jsonArrayFrom } from "kysely/helpers/postgres";
-import { dbSenat } from "../databases";
-import { concat, rtrim, toDateString } from "./util";
-function auteurs(amendementId) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("ameli.amdsen")
-        .leftJoin("ameli.sen_ameli", "ameli.amdsen.senid", "ameli.sen_ameli.entid")
-        .leftJoin("ameli.grppol_ameli", "ameli.amdsen.grpid", "ameli.grppol_ameli.entid")
-        .where("ameli.amdsen.amdid", "=", amendementId)
-        .select([
-        "ameli.amdsen.prenomuse as prenom",
-        "ameli.amdsen.hom as homonyme",
-        "ameli.amdsen.nomuse as nom",
-        "ameli.amdsen.qua as qualite",
-        "ameli.amdsen.rng as rang",
-        "ameli.sen_ameli.mat as matricule",
-        "ameli.amdsen.grpid as groupe_politique_id",
-        "ameli.grppol_ameli.cod as group_politique_code",
-        "ameli.grppol_ameli.libcou as groupe_politique_libelle_court",
-        "ameli.grppol_ameli.lilcou as groupe_politique_libelle",
-    ])
-        .orderBy("ameli.amdsen.rng", "asc"));
-}
-function scrutin(amendementNum, sesann, lecassidt) {
-    return dbSenat
-        .selectFrom("dosleg.amescr")
-        .leftJoin("dosleg.scr", (join) => join
-        .onRef("dosleg.amescr.scrnum", "=", "dosleg.scr.scrnum")
-        .onRef("dosleg.amescr.sesann", "=", "dosleg.scr.sesann"))
-        .leftJoin("dosleg.date_seance", "dosleg.scr.code", "dosleg.date_seance.code")
-        .where("dosleg.amescr.amescrnum", "=", amendementNum)
-        .where("dosleg.amescr.sesann", "=", sesann)
-        .where("dosleg.date_seance.lecidt", "=", lecassidt)
-        .select(["dosleg.amescr.scrnum as scrutin_num"])
-        .limit(1)
-        .as("scrutin_num");
-}
-const findAllAmendementsQuery = dbSenat
-    .selectFrom("ameli.amd")
-    .leftJoin("ameli.sub", "ameli.amd.subid", "ameli.sub.id")
-    .leftJoin("ameli.typsub", "ameli.sub.typid", "ameli.typsub.id")
-    .leftJoin("ameli.typrect", "ameli.amd.typrectid", "ameli.typrect.id")
-    .leftJoin("ameli.txt_ameli", "ameli.amd.txtid", "ameli.txt_ameli.id")
-    .leftJoin("ameli.etatxt", "ameli.txt_ameli.txtetaid", "ameli.etatxt.id")
-    .leftJoin("ameli.ses", "ameli.txt_ameli.sesdepid", "ameli.ses.id")
-    .leftJoin("ameli.typses", "ameli.typses.id", "ameli.ses.typid")
-    .leftJoin("ameli.nat", "ameli.txt_ameli.natid", "ameli.nat.id")
-    .leftJoin("ameli.lec_ameli", "ameli.txt_ameli.lecid", "ameli.lec_ameli.id")
-    .leftJoin("dosleg.texte", (join) => join.onRef("ameli.ses.ann", "=", "dosleg.texte.sesann").onRef("ameli.txt_ameli.numabs", "=", "dosleg.texte.texnum"))
-    .leftJoin("dosleg.lecass", "dosleg.texte.lecassidt", "dosleg.lecass.lecassidt")
-    .leftJoin("ameli.mot", "ameli.amd.motid", "ameli.mot.id")
-    .leftJoin("ameli.avicom", "ameli.amd.avcid", "ameli.avicom.id")
-    .leftJoin("ameli.avigvt", "ameli.amd.avgid", "ameli.avigvt.id")
-    .leftJoin("ameli.sor", "ameli.amd.sorid", "ameli.sor.id")
-    .leftJoin("ameli.irr", "ameli.amd.irrid", "ameli.irr.id")
-    .leftJoin("ameli.grppol_ameli", "ameli.amd.nomentid", "ameli.grppol_ameli.entid")
-    .leftJoin("ameli.com_ameli", "ameli.amd.nomentid", "ameli.com_ameli.entid")
-    .leftJoin("ameli.cab", "ameli.amd.nomentid", "ameli.cab.entid")
-    .select(({ eb, ref, val }) => [
-    "ameli.ses.ann as session",
-    "ameli.ses.lil as session_libelle",
-    "ameli.typses.lib as type_session",
-    "ameli.txt_ameli.doslegsignet as signet_dossier_legislatif",
-    "ameli.nat.libcourt as nature_texte",
-    "ameli.nat.lib as nature_texte_libelle",
-    "ameli.txt_ameli.numabs as numero_texte",
-    "ameli.txt_ameli.numado as numero_adoption_texte",
-    "ameli.txt_ameli.int as intitule_texte",
-    "ameli.etatxt.lic as etat_texte",
-    "ameli.etatxt.lib as etat_texte_libelle",
-    "ameli.etatxt.txttyp as type_texte",
-    "ameli.lec_ameli.lib as lecture",
-    eb
-        .case()
-        .when("ameli.amd.typ", "=", "A")
-        .then(val("Amendement"))
-        .when("ameli.amd.typ", "=", "M")
-        .then(val("Motion"))
-        .when("ameli.amd.typ", "=", "S")
-        .then(val("Sous-amendement"))
-        .else("")
-        .end()
-        .as("nature"),
-    "ameli.amd.id as id",
-    "ameli.amd.amdperid as parent_id",
-    "ameli.amd.ideid as identique_id",
-    "ameli.amd.discomid as discussion_commune_id",
-    "ameli.amd.num as numero",
-    "ameli.amd.numabs as numero_absolu",
-    "ameli.amd.ord as ordre",
-    "ameli.amd.accgou as accepte_gouvernement",
-    "ameli.amd.txtid as texte_id",
-    "ameli.sub.lib as subdivision_libelle",
-    "ameli.sub.lic as subdivision_libelle_court",
-    "ameli.sub.pos as subdivision_position_texte",
-    "ameli.sub.posder as subdivision_position_discussion",
-    "ameli.sub.merid as subdivision_mere_id",
-    "ameli.sub.sig as subdivision_signet",
-    "ameli.sub.comdelid as subdivision_commission_id",
-    "ameli.sub.dupl as subdivision_dupliquee",
-    "ameli.typsub.lib as subdivision_type",
-    "ameli.amd.alinea as alinea",
-    "ameli.amd.obs as observations",
-    "ameli.amd.mot as observations_additionnelles",
-    toDateString(ref("ameli.amd.datdep")).as("date_depot"),
-    "ameli.amd.dis as dispositif",
-    "ameli.amd.obj as objet",
-    "ameli.typrect.lib as type_rectification",
-    "ameli.mot.lib as motion_libelle",
-    eb
-        .case()
-        .when("ameli.amd.etaid", "=", 7)
-        .then(val("Diffusé"))
-        .when("ameli.amd.etaid", "=", 8)
-        .then(val("Retiré avant réunion ou séance"))
-        .when("ameli.amd.etaid", "=", 9)
-        .then(val("Examiné en commission ou séance"))
-        .when("ameli.amd.etaid", "=", 10)
-        .then(val("Irrecevable"))
-        .when("ameli.amd.etaid", "=", 11)
-        .then(val("Irrecevable"))
-        .else("")
-        .end()
-        .as("etat"),
-    "ameli.avicom.lib as avis_commission",
-    "ameli.avigvt.lib as avis_gouvernement",
-    eb.fn.coalesce("ameli.sor.lib", "ameli.irr.libirr").as("sort"),
-    "ameli.amd.rev as revision",
-    concat(eb
-        .case()
-        .when("ameli.amd.num", "like", "%COM%")
-        .then(val("https://www.senat.fr/amendements/commissions/"))
-        .else(val("https://www.senat.fr/amendements/"))
-        .end(), ref("ameli.ses.ann"), val("-"), sql `(ameli.ses.ann + 1)`, val("/"), ref("ameli.txt_ameli.numabs"), val("/Amdt_"), ref("ameli.amd.num"), val(".html")).as("url"),
-    "ameli.grppol_ameli.lilcou as au_nom_de_groupe_politique",
-    rtrim(ref("ameli.com_ameli.lil")).as("au_nom_de_commission"),
-    rtrim(ref("ameli.com_ameli.cod")).as("code_commission"),
-    eb.case().when("ameli.cab.entid", "is not", null).then(true).else(false).end().as("auteur_est_gouvernement"),
-    scrutin(ref("ameli.amd.num"), ref("ameli.ses.ann"), ref("dosleg.texte.lecassidt")),
-    auteurs(ref("ameli.amd.id")).as("auteurs"),
-]);
-export function findAllAmendements(fromSession) {
+import { streamUnsafeQuery } from "../databases_postgres";
+function buildFindAllAmendementsQuery(fromSession) {
+    const params = [];
+    const whereSession = fromSession === undefined ? "" : "where ses.ann >= $1";
     if (fromSession !== undefined) {
-        return findAllAmendementsQuery.where("ameli.ses.ann", ">=", fromSession).stream();
+        params.push(fromSession);
+    }
+    return {
+        params,
+        query: `
+      select
+        ses.ann::text as session,
+        ses.lil as session_libelle,
+        typses.lib as type_session,
+        txt_ameli.doslegsignet as signet_dossier_legislatif,
+        nat.libcourt as nature_texte,
+        nat.lib as nature_texte_libelle,
+        txt_ameli.numabs as numero_texte,
+        txt_ameli.numado as numero_adoption_texte,
+        txt_ameli.int as intitule_texte,
+        etatxt.lic as etat_texte,
+        etatxt.lib as etat_texte_libelle,
+        etatxt.txttyp as type_texte,
+        lec_ameli.lib as lecture,
+        case amd.typ
+          when 'A' then 'Amendement'
+          when 'M' then 'Motion'
+          when 'S' then 'Sous-amendement'
+          else ''
+        end as nature,
+        amd.id,
+        amd.amdperid as parent_id,
+        amd.ideid as identique_id,
+        amd.discomid as discussion_commune_id,
+        amd.num as numero,
+        amd.numabs as numero_absolu,
+        amd.ord as ordre,
+        amd.accgou as accepte_gouvernement,
+        amd.txtid as texte_id,
+        sub.lib as subdivision_libelle,
+        sub.lic as subdivision_libelle_court,
+        sub.pos as subdivision_position_texte,
+        sub.posder as subdivision_position_discussion,
+        sub.merid as subdivision_mere_id,
+        sub.sig as subdivision_signet,
+        sub.comdelid as subdivision_commission_id,
+        sub.dupl as subdivision_dupliquee,
+        typsub.lib as subdivision_type,
+        amd.alinea,
+        amd.obs as observations,
+        amd.mot as observations_additionnelles,
+        to_char(amd.datdep, 'YYYY-MM-DD') as date_depot,
+        amd.dis as dispositif,
+        amd.obj as objet,
+        typrect.lib as type_rectification,
+        mot.lib as motion_libelle,
+        case amd.etaid
+          when 7 then 'Diffusé'
+          when 8 then 'Retiré avant réunion ou séance'
+          when 9 then 'Examiné en commission ou séance'
+          when 10 then 'Irrecevable'
+          when 11 then 'Irrecevable'
+          else ''
+        end as etat,
+        avicom.lib as avis_commission,
+        avigvt.lib as avis_gouvernement,
+        coalesce(sor.lib, irr.libirr) as sort,
+        amd.rev as revision,
+        (
+          case
+            when amd.num like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
+            else 'https://www.senat.fr/amendements/'
+          end ||
+          ses.ann::text || '-' ||
+          (ses.ann + 1)::text || '/' ||
+          txt_ameli.numabs || '/Amdt_' ||
+          amd.num || '.html'
+        ) as url,
+        grppol_ameli.lilcou as au_nom_de_groupe_politique,
+        rtrim(com_ameli.lil) as au_nom_de_commission,
+        rtrim(com_ameli.cod) as code_commission,
+        (cab.entid is not null) as auteur_est_gouvernement,
+        (
+          select amescr.scrnum::text
+          from senat.dosleg_amescr as amescr
+          left join senat.dosleg_scr as scr
+            on amescr.scrnum = scr.scrnum
+           and amescr.sesann = scr.sesann
+          left join senat.dosleg_date_seance as date_seance on scr.code = date_seance.code
+          where amescr.amescrnum = amd.num
+            and amescr.sesann = ses.ann
+            and date_seance.lecidt = texte.lecassidt
+          limit 1
+        ) as scrutin_num,
+        (
+          select coalesce(json_agg(author_rows order by author_rows.rang nulls last), '[]'::json)
+          from (
+            select
+              amdsen.prenomuse as prenom,
+              amdsen.hom as homonyme,
+              amdsen.nomuse as nom,
+              amdsen.qua as qualite,
+              amdsen.rng::text as rang,
+              sen_ameli.mat as matricule,
+              amdsen.grpid as groupe_politique_id,
+              grppol_ameli.cod as group_politique_code,
+              grppol_ameli.libcou as groupe_politique_libelle_court,
+              grppol_ameli.lilcou as groupe_politique_libelle
+            from senat.ameli_amdsen as amdsen
+            left join senat.ameli_sen_ameli as sen_ameli on amdsen.senid = sen_ameli.entid
+            left join senat.ameli_grppol_ameli as grppol_ameli on amdsen.grpid = grppol_ameli.entid
+            where amdsen.amdid = amd.id
+            order by amdsen.rng asc
+          ) as author_rows
+        ) as auteurs
+      from senat.ameli_amd as amd
+      left join senat.ameli_sub as sub on amd.subid = sub.id
+      left join senat.ameli_typsub as typsub on sub.typid = typsub.id
+      left join senat.ameli_typrect as typrect on amd.typrectid = typrect.id
+      left join senat.ameli_txt_ameli as txt_ameli on amd.txtid = txt_ameli.id
+      left join senat.ameli_etatxt as etatxt on txt_ameli.txtetaid = etatxt.id
+      left join senat.ameli_ses as ses on txt_ameli.sesdepid = ses.id
+      left join senat.ameli_typses as typses on typses.id = ses.typid
+      left join senat.ameli_nat as nat on txt_ameli.natid = nat.id
+      left join senat.ameli_lec_ameli as lec_ameli on txt_ameli.lecid = lec_ameli.id
+      left join senat.dosleg_texte as texte
+        on ses.ann = texte.sesann
+        and txt_ameli.numabs = texte.texnum
+      left join senat.dosleg_lecass as lecass on texte.lecassidt = lecass.lecassidt
+      left join senat.ameli_mot as mot on amd.motid = mot.id
+      left join senat.ameli_avicom as avicom on amd.avcid = avicom.id
+      left join senat.ameli_avigvt as avigvt on amd.avgid = avigvt.id
+      left join senat.ameli_sor as sor on amd.sorid = sor.id
+      left join senat.ameli_irr as irr on amd.irrid = irr.id
+      left join senat.ameli_grppol_ameli as grppol_ameli on amd.nomentid = grppol_ameli.entid
+      left join senat.ameli_com_ameli as com_ameli on amd.nomentid = com_ameli.entid
+      left join senat.ameli_cab as cab on amd.nomentid = cab.entid
+      ${whereSession}
+    `,
+    };
+}
+export async function* findAllAmendements(fromSession) {
+    const { query, params } = buildFindAllAmendementsQuery(fromSession);
+    for await (const row of streamUnsafeQuery(query, params)) {
+        yield {
+            ...row,
+            auteurs: row.auteurs ?? [],
+        };
     }
-    return findAllAmendementsQuery.stream();
 }

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

@@ -0,0 +1,67 @@
+export interface AmendementAuteurRow {
+    group_politique_code: string | null;
+    groupe_politique_id: number | null;
+    groupe_politique_libelle: string | null;
+    groupe_politique_libelle_court: string | null;
+    homonyme: string | null;
+    matricule: string | null;
+    nom: string | null;
+    prenom: string | null;
+    qualite: string | null;
+    rang: string | null;
+}
+export interface AmendementPostgresResult {
+    accepte_gouvernement: string | null;
+    alinea: number | null;
+    auteur_est_gouvernement: boolean;
+    au_nom_de_commission: string | null;
+    au_nom_de_groupe_politique: string | null;
+    auteurs: AmendementAuteurRow[];
+    avis_commission: string | null;
+    avis_gouvernement: string | null;
+    code_commission: string | null;
+    date_depot: string | null;
+    discussion_commune_id: number | null;
+    dispositif: string | null;
+    etat: string;
+    etat_texte: string | null;
+    etat_texte_libelle: string | null;
+    id: number;
+    identique_id: number | null;
+    intitule_texte: string | null;
+    lecture: string | null;
+    motion_libelle: string | null;
+    nature: string;
+    nature_texte: string | null;
+    nature_texte_libelle: string | null;
+    numero: string;
+    numero_absolu: string | null;
+    numero_adoption_texte: string | null;
+    numero_texte: string | null;
+    objet: string | null;
+    observations: string | null;
+    observations_additionnelles: string | null;
+    ordre: number | null;
+    parent_id: number | null;
+    revision: string | null;
+    session: string;
+    session_libelle: string;
+    signet_dossier_legislatif: string | null;
+    sort: string | null;
+    scrutin_num: string | null;
+    subdivision_commission_id: number | null;
+    subdivision_dupliquee: string | null;
+    subdivision_libelle: string | null;
+    subdivision_libelle_court: string | null;
+    subdivision_mere_id: number | null;
+    subdivision_position_discussion: number | null;
+    subdivision_position_texte: number | null;
+    subdivision_signet: string | null;
+    subdivision_type: string | null;
+    texte_id: number | null;
+    type_rectification: string | null;
+    type_session: string | null;
+    type_texte: string | null;
+    url: string;
+}
+export declare function findAllAmendementsPostgres(fromSession?: number): AsyncGenerator<AmendementPostgresResult, void, unknown>;

package/lib/src/model/ameli_postgres.js

@@ -0,0 +1,150 @@
+import { streamUnsafeQuery } from "../databases_postgres";
+function buildFindAllAmendementsQuery(fromSession) {
+    const params = [];
+    const whereSession = fromSession === undefined ? "" : "where ameli.ses.ann >= $1";
+    if (fromSession !== undefined) {
+        params.push(String(fromSession));
+    }
+    return {
+        params,
+        query: `
+    select
+      ameli.ses.ann::text as session,
+      ameli.ses.lil as session_libelle,
+      ameli.typses.lib as type_session,
+      ameli.txt_ameli.doslegsignet as signet_dossier_legislatif,
+      ameli.nat.libcourt as nature_texte,
+      ameli.nat.lib as nature_texte_libelle,
+      ameli.txt_ameli.numabs as numero_texte,
+      ameli.txt_ameli.numado as numero_adoption_texte,
+      ameli.txt_ameli.int as intitule_texte,
+      ameli.etatxt.lic as etat_texte,
+      ameli.etatxt.lib as etat_texte_libelle,
+      ameli.etatxt.txttyp as type_texte,
+      ameli.lec_ameli.lib as lecture,
+      case ameli.amd.typ
+        when 'A' then 'Amendement'
+        when 'M' then 'Motion'
+        when 'S' then 'Sous-amendement'
+        else ''
+      end as nature,
+      ameli.amd.id,
+      ameli.amd.amdperid as parent_id,
+      ameli.amd.ideid as identique_id,
+      ameli.amd.discomid as discussion_commune_id,
+      ameli.amd.num as numero,
+      ameli.amd.numabs as numero_absolu,
+      ameli.amd.ord as ordre,
+      ameli.amd.accgou as accepte_gouvernement,
+      ameli.amd.txtid as texte_id,
+      ameli.sub.lib as subdivision_libelle,
+      ameli.sub.lic as subdivision_libelle_court,
+      ameli.sub.pos as subdivision_position_texte,
+      ameli.sub.posder as subdivision_position_discussion,
+      ameli.sub.merid as subdivision_mere_id,
+      ameli.sub.sig as subdivision_signet,
+      ameli.sub.comdelid as subdivision_commission_id,
+      ameli.sub.dupl as subdivision_dupliquee,
+      ameli.typsub.lib as subdivision_type,
+      ameli.amd.alinea,
+      ameli.amd.obs as observations,
+      ameli.amd.mot as observations_additionnelles,
+      to_char(ameli.amd.datdep, 'YYYY-MM-DD') as date_depot,
+      ameli.amd.dis as dispositif,
+      ameli.amd.obj as objet,
+      ameli.typrect.lib as type_rectification,
+      ameli.mot.lib as motion_libelle,
+      case ameli.amd.etaid
+        when 7 then 'Diffusé'
+        when 8 then 'Retiré avant réunion ou séance'
+        when 9 then 'Examiné en commission ou séance'
+        when 10 then 'Irrecevable'
+        when 11 then 'Irrecevable'
+        else ''
+      end as etat,
+      ameli.avicom.lib as avis_commission,
+      ameli.avigvt.lib as avis_gouvernement,
+      coalesce(ameli.sor.lib, ameli.irr.libirr) as sort,
+      ameli.amd.rev as revision,
+      (
+        case
+          when ameli.amd.num like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
+          else 'https://www.senat.fr/amendements/'
+        end ||
+        ameli.ses.ann::text || '-' ||
+        (ameli.ses.ann + 1)::text || '/' ||
+        ameli.txt_ameli.numabs || '/Amdt_' ||
+        ameli.amd.num || '.html'
+      ) as url,
+      ameli.grppol_ameli.lilcou as au_nom_de_groupe_politique,
+      rtrim(ameli.com_ameli.lil) as au_nom_de_commission,
+      rtrim(ameli.com_ameli.cod) as code_commission,
+      (ameli.cab.entid is not null) as auteur_est_gouvernement,
+      (
+        select dosleg.amescr.scrnum::text
+        from dosleg.amescr
+        left join dosleg.scr
+          on dosleg.amescr.scrnum = dosleg.scr.scrnum
+         and dosleg.amescr.sesann = dosleg.scr.sesann
+        left join dosleg.date_seance on dosleg.scr.code = dosleg.date_seance.code
+        where dosleg.amescr.amescrnum = ameli.amd.num
+          and dosleg.amescr.sesann = ameli.ses.ann
+          and dosleg.date_seance.lecidt = dosleg.texte.lecassidt
+        limit 1
+      ) as scrutin_num,
+      (
+        select coalesce(json_agg(author_rows order by author_rows.rang nulls last), '[]'::json)
+        from (
+          select
+            ameli.amdsen.prenomuse as prenom,
+            ameli.amdsen.hom as homonyme,
+            ameli.amdsen.nomuse as nom,
+            ameli.amdsen.qua as qualite,
+            ameli.amdsen.rng::text as rang,
+            ameli.sen_ameli.mat as matricule,
+            ameli.amdsen.grpid as groupe_politique_id,
+            ameli.grppol_ameli.cod as group_politique_code,
+            ameli.grppol_ameli.libcou as groupe_politique_libelle_court,
+            ameli.grppol_ameli.lilcou as groupe_politique_libelle
+          from ameli.amdsen
+          left join ameli.sen_ameli on ameli.amdsen.senid = ameli.sen_ameli.entid
+          left join ameli.grppol_ameli on ameli.amdsen.grpid = ameli.grppol_ameli.entid
+          where ameli.amdsen.amdid = ameli.amd.id
+          order by ameli.amdsen.rng asc
+        ) as author_rows
+      ) as auteurs
+    from ameli.amd
+    left join ameli.sub on ameli.amd.subid = ameli.sub.id
+    left join ameli.typsub on ameli.sub.typid = ameli.typsub.id
+    left join ameli.typrect on ameli.amd.typrectid = ameli.typrect.id
+    left join ameli.txt_ameli on ameli.amd.txtid = ameli.txt_ameli.id
+    left join ameli.etatxt on ameli.txt_ameli.txtetaid = ameli.etatxt.id
+    left join ameli.ses on ameli.txt_ameli.sesdepid = ameli.ses.id
+    left join ameli.typses on ameli.typses.id = ameli.ses.typid
+    left join ameli.nat on ameli.txt_ameli.natid = ameli.nat.id
+    left join ameli.lec_ameli on ameli.txt_ameli.lecid = ameli.lec_ameli.id
+    left join dosleg.texte
+      on ameli.ses.ann::text = dosleg.texte.sesann
+     and ameli.txt_ameli.numabs = dosleg.texte.texnum
+    left join dosleg.lecass on dosleg.texte.lecassidt = dosleg.lecass.lecassidt
+    left join ameli.mot on ameli.amd.motid = ameli.mot.id
+    left join ameli.avicom on ameli.amd.avcid = ameli.avicom.id
+    left join ameli.avigvt on ameli.amd.avgid = ameli.avigvt.id
+    left join ameli.sor on ameli.amd.sorid = ameli.sor.id
+    left join ameli.irr on ameli.amd.irrid = ameli.irr.id
+    left join ameli.grppol_ameli on ameli.amd.nomentid = ameli.grppol_ameli.entid
+    left join ameli.com_ameli on ameli.amd.nomentid = ameli.com_ameli.entid
+    left join ameli.cab on ameli.amd.nomentid = ameli.cab.entid
+    ${whereSession}
+  `,
+    };
+}
+export async function* findAllAmendementsPostgres(fromSession) {
+    const { query, params } = buildFindAllAmendementsQuery(fromSession);
+    for await (const row of streamUnsafeQuery(query, params)) {
+        yield {
+            ...row,
+            auteurs: row.auteurs ?? [],
+        };
+    }
+}

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

@@ -1,10 +1,11 @@
 import * as cheerio from "cheerio";
+import type { AnyNode } from "domhandler";
 import { CompteRendu } from "../types/compte_rendu";
 import { Reunion } from "../types/agenda";
-export declare function getRemainingTextAfterSpeakerHeader($: cheerio.CheerioAPI, $p: cheerio.Cheerio<any>): string;
+export declare function getRemainingTextAfterSpeakerHeader($: cheerio.CheerioAPI, $p: cheerio.Cheerio<AnyNode>): string;
 export type DaySection = {
     title: string;
-    $start: cheerio.Cheerio<any>;
+    $start: cheerio.Cheerio<AnyNode>;
     time?: string;
 };
 export declare function cleanTitle(t: string): string;

package/lib/src/model/commission.js

@@ -39,7 +39,7 @@ function collectLeadingHeaderStrongEls($, $clone) {
             }
             if ($n.is("a") && $n.children("strong, b").length) {
                 $n.children("strong, b").each((_, el) => {
-                    els.push($(el));
+                    els.push(el);
                 });
                 continue;
             }
@@ -68,7 +68,7 @@ function buildPointsFromParagraphs($, paras) {
     const normSpeaker = (s) => s
         .normalize("NFKC")
         .replace(/\s+/g, " ")
-        .replace(/[:\.]\s*$/, "")
+        .replace(/[.:]\s*$/, "")
         .trim();
     const normQual = (s) => s
         .normalize("NFKC")