@tricoteuses/senat 2.22.16 → 3.0.0

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")

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

@@ -1,67 +1,39 @@
-import { InferResult } from "kysely";
-export type DebatResult = InferResult<typeof findAllQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<any, "debats.debats", {
-    [x: string]: any;
+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;
-    date_seance: string;
-    sections: {
-        [x: string]: any;
-        interventions: {
-            [x: string]: any;
-            auteur: {
-                code: any;
-                nom: any;
-                prenom: any;
-                matricule: any;
-            };
-        }[];
-    }[];
-    sections_divers: {
-        [x: string]: any;
-        interventions: {
-            [x: string]: any;
-            auteur: {
-                code: any;
-                nom: any;
-                prenom: any;
-                matricule: any;
-            };
-        }[];
-    }[];
-    lectures: {
-        id: any;
-    }[];
-}>;
-export declare function findAll(fromSession?: number): AsyncIterableIterator<{
-    [x: string]: any;
-    id: string;
-    date_seance: string;
-    sections: {
-        [x: string]: any;
-        interventions: {
-            [x: string]: any;
-            auteur: {
-                code: any;
-                nom: any;
-                prenom: any;
-                matricule: any;
-            };
-        }[];
-    }[];
-    sections_divers: {
-        [x: string]: any;
-        interventions: {
-            [x: string]: any;
-            auteur: {
-                code: any;
-                nom: any;
-                prenom: any;
-                matricule: any;
-            };
-        }[];
-    }[];
-    lectures: {
-        id: any;
-    }[];
-}>;
-export {};
+}
+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;
+}
+export declare function findAll(): AsyncGenerator<DebatResult, void, unknown>;

package/lib/src/model/debats.js

@@ -1,95 +1,112 @@
-import { jsonArrayFrom, jsonBuildObject } from "kysely/helpers/postgres";
-import { dbSenat } from "../databases";
-import { ID_DATE_FORMAT } from "../scripts/datautil";
-import { toDateString } from "./util";
-function sectionsLegislatives(dateSeance) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.secdis")
-        .leftJoin("debats.typsec", "debats.secdis.typseccod", "debats.typsec.typseccod")
-        .where("debats.secdis.datsea", "=", dateSeance)
-        .select(({ ref }) => [
-        "debats.secdis.secdisordid as id",
-        "debats.secdis.secdisnum as numero",
-        "debats.secdis.secdisobj as objet",
-        "debats.secdis.secdisurl as url",
-        "debats.typsec.typseclib as type",
-        "debats.typsec.typseccat as categorie",
-        interventionsLegislatives(ref("debats.secdis.secdiscle")).as("interventions"),
-        "debats.secdis.lecassidt as lecture_id",
-    ])
-        .orderBy("debats.secdis.secdisordid", "asc"));
+import { streamUnsafeQuery } from "../databases_postgres";
+function buildFindAllDebatsQuery() {
+    return {
+        params: [],
+        query: `
+      select
+        to_char(debats.datsea, 'YYYYMMDD') as id,
+        to_char(debats.datsea, 'YYYY-MM-DD') as date_seance,
+        debats.numero::text as numero,
+        debats.deburl as url,
+        debats.debsyn as etat_synchronisation,
+        (
+          select coalesce(json_agg(section_rows order by section_rows.section_order nulls last), '[]'::json)
+          from (
+            select
+              secdis.secdisordid::text as id,
+              secdis.secdisnum as numero,
+              secdis.secdisobj as objet,
+              secdis.secdisurl as url,
+              typsec.typseclib as type,
+              typsec.typseccat as categorie,
+              secdis.lecassidt as lecture_id,
+              secdis.secdisordid as section_order,
+              (
+                select coalesce(
+                  json_agg(intervention_rows order by intervention_rows.intervention_order nulls last),
+                  '[]'::json
+                )
+                from (
+                  select
+                    intpjl.intordid::text as id,
+                    intpjl.autcod as auteur_code,
+                    intpjl.intfon as fonction_intervenant,
+                    intpjl.inturl as url,
+                    intpjl.intana as analyse,
+                    json_build_object(
+                      'code', auteur.autcod,
+                      'nom', auteur.nomuse,
+                      'prenom', auteur.prenom,
+                      'matricule', auteur.autmat
+                    ) as auteur,
+                    intpjl.intordid as intervention_order
+                  from senat.debats_intpjl as intpjl
+                  left join senat.dosleg_auteur as auteur on intpjl.autcod = auteur.autcod
+                  where intpjl.secdiscle = secdis.secdiscle
+                ) as intervention_rows
+              ) as interventions
+            from senat.debats_secdis as secdis
+            left join senat.debats_typsec as typsec on secdis.typseccod = typsec.typseccod
+            where secdis.datsea = debats.datsea
+          ) as section_rows
+        ) as sections,
+        (
+          select coalesce(json_agg(section_rows), '[]'::json)
+          from (
+            select
+              secdivers.secdiverslibelle as libelle,
+              secdivers.secdiversobj as objet,
+              typsec.typseclib as type,
+              typsec.typseccat as categorie,
+              (
+                select coalesce(
+                  json_agg(intervention_rows order by intervention_rows.intervention_order nulls last),
+                  '[]'::json
+                )
+                from (
+                  select
+                    intdivers.intdiversordid::text as id,
+                    intdivers.autcod as auteur_code,
+                    intdivers.intfon as fonction_intervenant,
+                    intdivers.inturl as url,
+                    intdivers.intana as analyse,
+                    json_build_object(
+                      'code', auteur.autcod,
+                      'nom', auteur.nomuse,
+                      'prenom', auteur.prenom,
+                      'matricule', auteur.autmat
+                    ) as auteur,
+                    intdivers.intdiversordid as intervention_order
+                  from senat.debats_intdivers as intdivers
+                  left join senat.dosleg_auteur as auteur on intdivers.autcod = auteur.autcod
+                  where intdivers.secdiverscle = secdivers.secdiverscle
+                ) as intervention_rows
+              ) as interventions
+            from senat.debats_secdivers as secdivers
+            left join senat.debats_typsec as typsec on secdivers.typseccod = typsec.typseccod
+            where secdivers.datsea = debats.datsea
+          ) as section_rows
+        ) as sections_divers,
+        (
+          select coalesce(json_agg(lecture_rows), '[]'::json)
+          from (
+            select lecassdeb.lecassidt as id
+            from senat.debats_lecassdeb as lecassdeb
+            where lecassdeb.datsea = debats.datsea
+          ) as lecture_rows
+        ) as lectures
+      from senat.debats_debats as debats
+    `,
+    };
 }
-function interventionsLegislatives(sectionId) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.intpjl")
-        .leftJoin("dosleg.auteur", "debats.intpjl.autcod", "dosleg.auteur.autcod")
-        .where("debats.intpjl.secdiscle", "=", sectionId)
-        .select(({ ref, val, fn }) => [
-        "debats.intpjl.intordid as id",
-        "debats.intpjl.autcod as auteur_code",
-        "debats.intpjl.intfon as fonction_intervenant",
-        "debats.intpjl.inturl as url",
-        "debats.intpjl.intana as analyse",
-        jsonBuildObject({
-            code: ref("dosleg.auteur.autcod"),
-            nom: ref("dosleg.auteur.nomuse"),
-            prenom: ref("dosleg.auteur.prenom"),
-            matricule: ref("dosleg.auteur.autmat"),
-        }).as("auteur"),
-    ])
-        .orderBy("debats.intpjl.intordid", "asc"));
-}
-function sectionsNonLegislatives(dateSeance) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.secdivers")
-        .leftJoin("debats.typsec", "debats.secdivers.typseccod", "debats.typsec.typseccod")
-        .where("debats.secdivers.datsea", "=", dateSeance)
-        .select(({ ref }) => [
-        "debats.secdivers.secdiverslibelle as libelle",
-        "debats.secdivers.secdiversobj as objet",
-        "debats.typsec.typseclib as type",
-        "debats.typsec.typseccat as categorie",
-        interventionsNonLegislatives(ref("debats.secdivers.secdiverscle")).as("interventions"),
-    ]));
-}
-function interventionsNonLegislatives(sectionId) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.intdivers")
-        .leftJoin("dosleg.auteur", "debats.intdivers.autcod", "dosleg.auteur.autcod")
-        .where("debats.intdivers.intdiverscle", "=", sectionId)
-        .select(({ ref, val }) => [
-        "debats.intdivers.intdiversordid as id",
-        "debats.intdivers.autcod as auteur_code",
-        "debats.intdivers.intfon as fonction_intervenant",
-        "debats.intdivers.inturl as url",
-        "debats.intdivers.intana as analyse",
-        jsonBuildObject({
-            code: ref("dosleg.auteur.autcod"),
-            nom: ref("dosleg.auteur.nomuse"),
-            prenom: ref("dosleg.auteur.prenom"),
-            matricule: ref("dosleg.auteur.autmat"),
-        }).as("auteur"),
-    ])
-        .orderBy("debats.intdivers.intdiversordid", "asc"));
-}
-function lecturesAssemblee(dateSeance) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.lecassdeb")
-        .where("debats.lecassdeb.datsea", "=", dateSeance)
-        .select("debats.lecassdeb.lecassidt as id"));
-}
-const findAllQuery = dbSenat
-    .selectFrom("debats.debats")
-    .select(({ ref, val }) => [
-    toDateString(ref("debats.debats.datsea"), val(ID_DATE_FORMAT)).as("id"),
-    toDateString(ref("debats.debats.datsea")).as("date_seance"),
-    "debats.debats.numero as numero",
-    "debats.debats.deburl as url",
-    "debats.debats.debsyn as etat_synchronisation",
-    sectionsLegislatives(ref("debats.debats.datsea")).as("sections"),
-    sectionsNonLegislatives(ref("debats.debats.datsea")).as("sections_divers"),
-    lecturesAssemblee(ref("debats.debats.datsea")).as("lectures"),
-]);
-export function findAll(fromSession) {
-    return findAllQuery.stream();
+export async function* findAll() {
+    const { query, params } = buildFindAllDebatsQuery();
+    for await (const row of streamUnsafeQuery(query, params)) {
+        yield {
+            ...row,
+            lectures: row.lectures ?? [],
+            sections: row.sections ?? [],
+            sections_divers: row.sections_divers ?? [],
+        };
+    }
 }

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

@@ -1,12 +1,32 @@
-import { Expression, InferResult, SelectQueryBuilder } from "kysely";
-export declare function rapports(lectureAssembleeId: Expression<string>): import("kysely").RawBuilder<{
-    [x: string]: any;
-}[]>;
-declare const queryTextes: SelectQueryBuilder<any, any, any>;
-export declare function textes(lectureAssembleeId: Expression<string>): import("kysely").RawBuilder<{
-    [x: string]: any;
-}[]>;
-export declare function findAllTextes(): AsyncIterableIterator<DocumentResult>;
-export declare function findAllRapports(): AsyncIterableIterator<DocumentResult>;
-export type DocumentResult = InferResult<typeof queryTextes>[0];
-export {};
+export interface AuteurDocumentRow {
+    matricule: string | null;
+    nom_usuel: string;
+    ordre: string | null;
+    prenom: string | null;
+    qualite: string | null;
+    role: string | null;
+}
+export interface DocumentAnnexeRow {
+    type_document: string;
+    url: string | null;
+}
+export interface DocumentResult {
+    auteurs: AuteurDocumentRow[];
+    code_adoption?: string | null;
+    code_organisme: string | null;
+    date: string;
+    documents_annexes?: DocumentAnnexeRow[];
+    id: string | null;
+    modification?: string | null;
+    numero: number | string | null;
+    ordre_origine?: string | null;
+    origine?: string | null;
+    session: number | null;
+    signet_dossier?: string | null;
+    sous_titre?: string | null;
+    titre: string | null;
+    type: string | null;
+    url: string | null;
+}
+export declare function findAllTextes(): AsyncGenerator<DocumentResult, void, unknown>;
+export declare function findAllRapports(): AsyncGenerator<DocumentResult, void, unknown>;