@tricoteuses/senat 2.22.13 → 2.22.14

package/lib/model/scrutins.js

@@ -1,114 +0,0 @@
-import { sql } from "kysely";
-import { jsonArrayFrom } from "kysely/helpers/postgres";
-import { dbSenat } from "../databases";
-import { rtrim, toDateString } from "./util";
-function votes(scrutinNum, scrutinSession, scrutinDate) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("dosleg.votsen")
-        .leftJoin("dosleg.titsen", "dosleg.titsen.titsencod", "dosleg.votsen.titsencod")
-        .leftJoin("dosleg.stavot", "dosleg.stavot.stavotidt", "dosleg.votsen.stavotidt")
-        .leftJoin("dosleg.posvot", "dosleg.posvot.posvotcod", "dosleg.votsen.posvotcod")
-        .leftJoin("sens.memgrppol", (join) => join
-        .onRef("sens.memgrppol.senmat", "=", "dosleg.votsen.senmat")
-        .onRef("sens.memgrppol.memgrppoldatdeb", "<=", scrutinDate)
-        .on((eb) => eb.or([
-        eb("sens.memgrppol.memgrppoldatfin", ">=", scrutinDate),
-        eb("sens.memgrppol.memgrppoldatfin", "is", null),
-    ])))
-        .where("dosleg.votsen.scrnum", "=", scrutinNum)
-        .where("dosleg.votsen.sesann", "=", scrutinSession)
-        .orderBy("sens.memgrppol.memgrppoldatdeb", "desc")
-        .select([
-        "dosleg.votsen.senmat as matricule_votant",
-        "dosleg.votsen.senmatdel as matricule_delegant",
-        "dosleg.posvot.posvotlib as position",
-        "dosleg.stavot.stavotlib as statut_votant",
-        "dosleg.titsen.titsenlib as titre_votant",
-        "sens.memgrppol.memgrppolid as groupe_politique_id",
-        "sens.memgrppol.grppolcod as groupe_politique_code",
-    ]));
-}
-function groupesVotants(scrutinNum, scrutinSession, scrutinDate) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom((eb) => eb
-        .selectFrom("dosleg.votsen")
-        .leftJoin("dosleg.posvot", "dosleg.posvot.posvotcod", "dosleg.votsen.posvotcod")
-        .leftJoin("dosleg.stavot", "dosleg.stavot.stavotidt", "dosleg.votsen.stavotidt")
-        .leftJoin("sens.memgrppol", (join) => join
-        .onRef("sens.memgrppol.senmat", "=", "dosleg.votsen.senmat")
-        .onRef("sens.memgrppol.memgrppoldatdeb", "<=", scrutinDate)
-        .on((eb) => eb.or([
-        eb("sens.memgrppol.memgrppoldatfin", ">=", scrutinDate),
-        eb("sens.memgrppol.memgrppoldatfin", "is", null),
-    ])))
-        .where("dosleg.votsen.scrnum", "=", scrutinNum)
-        .where("dosleg.votsen.sesann", "=", scrutinSession)
-        .orderBy("sens.memgrppol.memgrppoldatdeb", "desc")
-        .select([
-        "dosleg.votsen.senmat",
-        "dosleg.posvot.posvotlib",
-        "dosleg.stavot.stavotlib",
-        "sens.memgrppol.grppolcod",
-    ])
-        .as("unique_votes"))
-        .groupBy(["unique_votes.grppolcod"])
-        .select(({ fn, eb }) => [
-        "unique_votes.grppolcod as groupe_politique_code",
-        fn.sum(eb.case().when("unique_votes.posvotlib", "=", "pour").then(1).else(0).end()).as("nombre_pour"),
-        fn.sum(eb.case().when("unique_votes.posvotlib", "=", "contre").then(1).else(0).end()).as("nombre_contre"),
-        fn
-            .sum(eb.case().when("unique_votes.posvotlib", "=", "abstention").then(1).else(0).end())
-            .as("nombre_abstentions"),
-        fn
-            .sum(eb.case().when("unique_votes.posvotlib", "=", "non-votant").then(1).else(0).end())
-            .as("nombre_non_votants"),
-        fn.count("unique_votes.senmat").as("nombre_votants"),
-    ]));
-}
-function misesAuPoint(scrutinNum) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("corscr")
-        .where("corscr.scrnum", "=", scrutinNum)
-        .select(["corscr.corscrtxt as texte", "corscr.corscrord as ordre", "corscr.corscrurl as url"]));
-}
-const findAllScrutinsQuery = dbSenat
-    .withSchema("dosleg")
-    .selectFrom("scr")
-    .leftJoin("date_seance", "scr.code", "date_seance.code")
-    .leftJoin("lecass", "date_seance.lecidt", "lecass.lecassidt")
-    .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
-    .leftJoin("loi", "loi.loicod", "lecture.loicod")
-    .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
-    .select(({ eb, ref, val }) => [
-    "scr.sesann as session",
-    "scr.scrnum as numero",
-    rtrim(ref("date_seance.lecidt")).as("lecture_id"),
-    rtrim(ref("lecture.leccom")).as("lecture_libelle"),
-    "loi.signet as signet_dossier",
-    rtrim(ref("typlec.typleclib")).as("type_lecture"),
-    toDateString(ref("scr.scrdat")).as("date_scrutin"),
-    toDateString(ref("scr.scrdateff")).as("date_scrutin_effective"),
-    sql `REPLACE(scr.scrint, E'\\u0092', '''')`.as("intitule"),
-    "scr.scrbaspag as note",
-    "scr.scrmaj as nombre_majorite",
-    "scr.scrmajsea as nombre_majorite_seance",
-    "scr.scrvot as nombre_votants",
-    "scr.scrvotsea as nombre_votants_seance",
-    "scr.scrsuf as nombre_suffrages",
-    "scr.scrsufsea as nombre_suffrages_seance",
-    "scr.scrcon as nombre_contre",
-    "scr.scrconsea as nombre_contre_seance",
-    "scr.scrpou as nombre_pour",
-    "scr.scrpousea as nombre_pour_seance",
-    votes(ref("scr.scrnum"), ref("scr.sesann"), ref("scr.scrdat")).as("votes"),
-    groupesVotants(ref("scr.scrnum"), ref("scr.sesann"), ref("scr.scrdat")).as("groupes_votants"),
-    misesAuPoint(ref("scr.scrnum")).as("mises_au_point"),
-])
-    .$narrowType();
-export function findAllScrutins(fromSession) {
-    if (fromSession !== undefined) {
-        return findAllScrutinsQuery.where("scr.sesann", ">=", fromSession).stream();
-    }
-    return findAllScrutinsQuery.stream();
-}

package/lib/model/seance.d.ts

@@ -1,3 +0,0 @@
-import { CompteRendu } from "../types/compte_rendu";
-export declare function parseCompteRenduIntervalFromFile(xmlFilePath: string, startIndex: number, endIndex: number, agendaEventId: string): Promise<CompteRendu | null>;
-export declare function sessionStartYearFromDate(d: Date): number;

package/lib/model/seance.js

@@ -1,267 +0,0 @@
-import fs from "fs";
-import * as cheerio from "cheerio";
-import { toCRDate } from "./util";
-import { makeReunionUid } from "../utils/reunion_parsing";
-import { yyyymmddFromPath } from "../utils/date";
-import { decodeHtmlEntities, dedupeSpeaker, fixApostrophes, norm } from "../utils/string_cleaning";
-export async function parseCompteRenduIntervalFromFile(xmlFilePath, startIndex, endIndex, agendaEventId) {
-    try {
-        const raw = fs.readFileSync(xmlFilePath, "utf8");
-        const $ = cheerio.load(raw, { xml: false });
-        const metadonnees = extractMetadonnees($, xmlFilePath);
-        const order = $("body *").toArray();
-        const idx = new Map(order.map((el, i) => [el, i]));
-        const totalNodes = order.length;
-        const clampedStart = Math.max(0, Math.min(startIndex, totalNodes - 1));
-        const clampedEnd = Math.max(0, Math.min(endIndex, totalNodes - 1));
-        const intervals = [
-            {
-                start: clampedStart,
-                end: clampedEnd,
-            },
-        ];
-        metadonnees.sommaire = extractSommaireForIntervals($, idx, intervals);
-        const points = [];
-        let ordre = 0;
-        const addPoint = (p) => points.push({ ...p, ordre_absolu_seance: String(++ordre) });
-        // Interventions
-        $("div.intervenant").each((_, block) => {
-            if (!elementInAnyInterval(block, idx, intervals))
-                return;
-            const $block = $(block);
-            $block
-                .find([
-                "p[class^='titre_S']",
-                "p.mention_titre",
-                "p.intitule_titre",
-                "p.mention_chapitre",
-                "p.intitule_chapitre",
-                "p.mention_article",
-                "p.intitule_article",
-                "p.mention_section",
-                "p.intitule_section",
-            ].join(","))
-                .remove();
-            const firstP = $block.find("p").first();
-            if (!firstP || firstP.length === 0)
-                return;
-            const speakerLabelRaw = firstP.find(".orateur_nom").text() || firstP.find("a.lien_senfic").text() || "";
-            const speakerLabel = dedupeSpeaker(speakerLabelRaw);
-            const { mat, nom: nomCRI, qua: quaCRI } = readIntervenantMeta($block);
-            const qualFromSpans = extractAndRemoveLeadingQualite($, $block);
-            const qualite = norm(decodeHtmlEntities(quaCRI || "")) || qualFromSpans;
-            const canonicalName = dedupeSpeaker(nomCRI || speakerLabel);
-            const role = roleForSpeaker(speakerLabel) || roleForSpeaker(qualite) || roleForSpeaker(quaCRI || "");
-            const speechHtml = sanitizeInterventionHtml($, $block);
-            const speechText = norm(cheerio.load(speechHtml).text() || "");
-            if (!speechText)
-                return;
-            addPoint({
-                code_grammaire: "PAROLE_GENERIQUE",
-                roledebat: role,
-                orateurs: { orateur: { nom: canonicalName, id: mat || "", qualite } },
-                texte: { _: speechHtml },
-            });
-        });
-        const contenu = {
-            quantiemes: {
-                journee: metadonnees.dateSeance,
-                session: metadonnees.session,
-            },
-            point: points,
-        };
-        const yyyymmdd = yyyymmddFromPath(xmlFilePath);
-        const dateISO = `${yyyymmdd.slice(0, 4)}-${yyyymmdd.slice(4, 6)}-${yyyymmdd.slice(6, 8)}`;
-        const seanceRef = makeReunionUid(dateISO, "SP", agendaEventId, null);
-        return {
-            uid: `CRSSN${yyyymmdd}E${agendaEventId}`,
-            seanceRef,
-            sessionRef: metadonnees.session,
-            metadonnees,
-            contenu,
-        };
-    }
-    catch (e) {
-        console.error(`[CRI] parseInterval error file=${xmlFilePath} interval=[${startIndex}..${endIndex}] event=${agendaEventId}:`, e);
-        return null;
-    }
-}
-export function sessionStartYearFromDate(d) {
-    // Session (1th oct N → 30 sept N+1)
-    const m = d.getMonth();
-    const y = d.getFullYear();
-    return m >= 9 ? y : y - 1;
-}
-function roleForSpeaker(labelOrQualite) {
-    const s = (labelOrQualite || "").toLowerCase();
-    if (/^(m\.|mme)?\s*(le|la)\s+pr[ée]sident(e)?\b/.test(s) || /\bpr[ée]sident[e]?\s+de\s+séance\b/.test(s))
-        return "président";
-    return "";
-}
-function readIntervenantMeta($block) {
-    const int = $block.find("cri\\:intervenant").first();
-    if (int.length)
-        return { mat: int.attr("mat") || undefined, nom: int.attr("nom") || undefined, qua: int.attr("qua") || undefined };
-    const html = $block.html() || "";
-    const m = html.match(/<!--\s*cri:intervenant\b([^>]+)-->/i);
-    if (!m)
-        return {};
-    const out = {};
-    const re = /(\w+)="([^"]*)"/g;
-    let a;
-    while ((a = re.exec(m[1])))
-        out[a[1]] = decodeHtmlEntities(a[2]);
-    return { mat: out["mat"], nom: out["nom"], qua: out["qua"] };
-}
-function extractAndRemoveLeadingQualite($, $block) {
-    const firstP = $block.find("p").first();
-    if (firstP.length === 0)
-        return "";
-    const parts = [];
-    let stop = false;
-    firstP.contents().each((_, node) => {
-        if (stop)
-            return;
-        if (node.type === "tag") {
-            const $node = $(node);
-            if ($node.hasClass("orateur_nom")) {
-                $node.remove();
-                return;
-            }
-            if ($node.hasClass("orateur_qualite")) {
-                parts.push($node.text() || "");
-                $node.remove();
-                return;
-            }
-            const t = norm($node.text() || "");
-            if (t)
-                stop = true;
-            else
-                $node.remove();
-        }
-        else if (node.type === "text") {
-            const t = norm(node.data || "");
-            if (!t || /^[:.,;–—-]+$/.test(t)) {
-                ;
-                node.data = "";
-                return;
-            }
-            stop = true;
-        }
-    });
-    return fixApostrophes(norm(parts.join(" ")));
-}
-function sanitizeInterventionHtml($, $block) {
-    const ps = $block.find("p").toArray();
-    const cleaned = ps
-        .map((p) => {
-        const $p = $(p).clone();
-        $p.find(".orateur_nom, .orateur_qualite").remove();
-        $p.find("a").each((_, a) => {
-            const $a = $(a);
-            $a.replaceWith($a.text());
-        });
-        $p.find(".info_entre_parentheses").each((_, el) => {
-            const txt = $(el).text();
-            $(el).replaceWith($("<em/>").text(txt));
-        });
-        $p.find("span").each((_, span) => {
-            const $s = $(span);
-            if (!$s.text().trim())
-                $s.remove();
-        });
-        const inner = ($p.html() || "").trim();
-        if (!inner)
-            return null;
-        return `<p>${inner}</p>`;
-    })
-        .filter(Boolean);
-    return cleaned.join("<br/>");
-}
-function extractSommaireForIntervals($, idx, intervals) {
-    const inIv = (el) => elementInAnyInterval(el, idx, intervals);
-    const root = $("body");
-    const sommaire = { presidentSeance: { _: "" }, sommaire1: [] };
-    // (1) Présidence (tm2) — première ligne dans l’intervalle
-    const pres = root
-        .find("p.tm2")
-        .filter((_, el) => inIv(el))
-        .first();
-    if (pres.length)
-        sommaire.presidentSeance = { _: norm(pres.text()) };
-    // (2) Paras tm5 présents dans l’intervalle
-    const paras = [];
-    root.find("p.tm5").each((_, el) => {
-        if (!inIv(el))
-            return;
-        const t = norm($(el).text());
-        if (t)
-            paras.push({ _: t });
-    });
-    if (paras.length)
-        sommaire.para = paras.length === 1 ? paras[0] : paras;
-    // (3) Items de 1er niveau (tm3) présents dans l’intervalle
-    const items = [];
-    root.find("p.tm3").each((_, el) => {
-        if (!inIv(el))
-            return;
-        const $p = $(el);
-        const full = norm($p.text() || "");
-        if (!full)
-            return;
-        const numMatch = full.match(/^(\d+)\s*[.\-–—]\s*/);
-        const valeur = numMatch ? numMatch[1] : undefined;
-        // prefere intitule in ancre <a> if present
-        const a = $p.find("a").first();
-        const intituleRaw = a.length ? a.text() : full.replace(/^(\d+)\s*[.\-–—]\s*/, "");
-        const intitule = norm(intituleRaw);
-        // id_syceron from href="#Niv1_SOMx"
-        const href = (a.attr("href") || "").trim();
-        const idSyceron = href.startsWith("#") ? href.slice(1) : href;
-        const titreStruct = { id_syceron: idSyceron || "", intitule };
-        items.push({ valeur_pts_odj: valeur, titreStruct });
-    });
-    if (items.length)
-        sommaire.sommaire1 = items;
-    return sommaire;
-}
-function extractMetadonnees($, filePath) {
-    let dateText = norm($("h1, h2, .page-title").first().text() || "");
-    if (!dateText)
-        dateText = norm($("p").first().text() || "");
-    const dateMatch = dateText.match(/\b(\d{1,2}\s+\w+\s+\d{4})\b/i);
-    const allText = norm($("body").text() || "");
-    const sessionMatch = allText.match(/\bsession\s+(\d{4}-\d{4})\b/i);
-    let dateSeance = dateMatch?.[1] || "";
-    if (!dateSeance) {
-        const m = filePath.match(/d(\d{4})(\d{2})(\d{2})\.xml$/i);
-        if (m)
-            dateSeance = `${m[1]}-${m[2]}-${m[3]}`;
-    }
-    dateSeance = toCRDate(dateSeance, null);
-    return {
-        dateSeance,
-        dateSeanceJour: dateSeance,
-        numSeanceJour: "",
-        numSeance: "",
-        typeAssemblee: "SN",
-        legislature: "",
-        session: sessionMatch?.[1] || "",
-        nomFichierJo: "",
-        validite: "",
-        etat: "",
-        diffusion: "",
-        version: "1.0",
-        environnement: "",
-        heureGeneration: new Date(),
-    };
-}
-function elementInAnyInterval(el, idx, intervals) {
-    const p = idx.get(el);
-    if (p == null)
-        return false;
-    for (const iv of intervals)
-        if (p >= iv.start && p < iv.end)
-            return true;
-    return false;
-}

package/lib/model/sens.d.ts

@@ -1,146 +0,0 @@
-import { InferResult } from "kysely";
-export type SenateurResult = InferResult<typeof findAllQuery>[0];
-export type CirconscriptionResult = InferResult<typeof findAllCirconscriptionsQuery>[0];
-export type OrganismeResult = InferResult<typeof findAllOrganismesQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<{
-    [x: string]: any;
-    [x: number]: any;
-    [x: symbol]: any;
-}, "sen" | "etasen" | "pcs" | "pcs42" | "pcs24" | "pcs8" | "grppol" | "com", {
-    [x: string]: any;
-    date_naissance: string;
-    date_deces: string;
-    urls: {
-        code_url: any;
-        url: any;
-    }[];
-    mandats_senateur: {
-        [x: string]: any;
-        date_debut: string;
-        date_fin: string;
-    }[];
-    commissions: {
-        [x: string]: any;
-        date_debut: string;
-        date_fin: string;
-        fonctions: {
-            date_debut: string;
-            date_fin: string;
-            libelle: unknown;
-        }[];
-    }[];
-    delegations: {
-        [x: string]: any;
-        date_debut: string;
-        date_fin: string;
-        fonctions: {
-            date_debut: string;
-            date_fin: string;
-            libelle: unknown;
-        }[];
-    }[];
-    groupes: {
-        [x: string]: any;
-        date_debut: string;
-        date_fin: string;
-        fonctions: {
-            date_debut: string;
-            date_fin: string;
-            libelle: unknown;
-        }[];
-    }[];
-    fonctions_bureau: {
-        date_debut: string;
-        date_fin: string;
-        libelle: unknown;
-    }[];
-}>;
-declare const findAllCirconscriptionsQuery: import("kysely").SelectQueryBuilder<{
-    [x: string]: any;
-    [x: number]: any;
-    [x: symbol]: any;
-}, "dpt" | "reg", {
-    [x: string]: any;
-    date_debut: string;
-    date_fin: string;
-}>;
-declare const findAllOrganismesQuery: import("kysely").SelectQueryBuilder<{
-    [x: string]: any;
-    [x: number]: any;
-    [x: symbol]: any;
-}, "typorg" | "all_organismes", {
-    [x: string]: any;
-    url: string;
-    date_debut: string;
-    date_fin: string;
-    libelle_long: string;
-    type_libelle: string;
-}>;
-export declare function findAll(): AsyncIterableIterator<{
-    [x: string]: any;
-    date_naissance: string;
-    date_deces: string;
-    urls: {
-        code_url: any;
-        url: any;
-    }[];
-    mandats_senateur: {
-        [x: string]: any;
-        date_debut: string;
-        date_fin: string;
-    }[];
-    commissions: {
-        [x: string]: any;
-        date_debut: string;
-        date_fin: string;
-        fonctions: {
-            date_debut: string;
-            date_fin: string;
-            libelle: unknown;
-        }[];
-    }[];
-    delegations: {
-        [x: string]: any;
-        date_debut: string;
-        date_fin: string;
-        fonctions: {
-            date_debut: string;
-            date_fin: string;
-            libelle: unknown;
-        }[];
-    }[];
-    groupes: {
-        [x: string]: any;
-        date_debut: string;
-        date_fin: string;
-        fonctions: {
-            date_debut: string;
-            date_fin: string;
-            libelle: unknown;
-        }[];
-    }[];
-    fonctions_bureau: {
-        date_debut: string;
-        date_fin: string;
-        libelle: unknown;
-    }[];
-}>;
-export declare function findAllCirconscriptions(): AsyncIterableIterator<{
-    [x: string]: any;
-    date_debut: string;
-    date_fin: string;
-}>;
-export declare function findAllOrganismes(): AsyncIterableIterator<{
-    [x: string]: any;
-    url: string;
-    date_debut: string;
-    date_fin: string;
-    libelle_long: string;
-    type_libelle: string;
-}>;
-export declare function findActif(): AsyncIterableIterator<{
-    senmat: string;
-    sennomuse: string;
-    senprenomuse: string;
-}>;
-export {};