@tricoteuses/senat 2.22.13 → 2.22.14

package/lib/utils/reunion_grouping.js

@@ -1,337 +0,0 @@
-import { DateTime } from "luxon";
-import { norm } from "../model/util";
-import { buildOdj } from "./reunion_odj_building";
-const PARIS = "Europe/Paris";
-const STOPWORDS = new Set([
-    "de",
-    "du",
-    "des",
-    "la",
-    "le",
-    "les",
-    "l",
-    "d",
-    "et",
-    "en",
-    "au",
-    "aux",
-    "pour",
-    "sur",
-    "sous",
-    "à",
-    "a",
-    "aux",
-]);
-export function groupNonSPByTypeOrganeHour(events, DossierBySenatUrl) {
-    const out = { IDC: [], IDM: [], IDO: [], IDI: [] };
-    if (!events?.length)
-        return out;
-    const nonSP = events.filter((e) => !isSeancePublique(e?.type));
-    if (nonSP.length === 0)
-        return out;
-    for (const e of nonSP) {
-        const kind = classifyAgendaType(e?.type);
-        if (!kind || kind === "SP")
-            continue;
-        const { startISO, endISO } = deriveTimesForEvent(e);
-        const startTime = startISO ?? e.startTime ?? null;
-        const endTime = endISO ?? e.endTime ?? null;
-        const uid = makeTypeGroupUid(e.date, kind, e.id, e.organe ?? null);
-        const suffix = (kind === "COM" ? "IDC" : kind === "MC" ? "IDM" : kind === "OD" ? "IDO" : "IDI");
-        const group = {
-            uid,
-            chambre: "SN",
-            date: e.date,
-            type: e.type || "",
-            organe: e.organe || undefined,
-            startTime,
-            endTime,
-            captationVideo: e.captationVideo === true,
-            titre: e.titre,
-            objet: e.objet || "",
-            events: [e],
-            odj: buildOdj([e], DossierBySenatUrl),
-        };
-        out[suffix].push(group);
-    }
-    for (const k of Object.keys(out)) {
-        out[k].sort((a, b) => {
-            const da = DateTime.fromISO(`${a.date}T${a.startTime || "00:00:00.000+02:00"}`, { zone: PARIS }).toMillis();
-            const db = DateTime.fromISO(`${b.date}T${b.startTime || "00:00:00.000+02:00"}`, { zone: PARIS }).toMillis();
-            return da - db || (a.organe || "").localeCompare(b.organe || "");
-        });
-    }
-    return out;
-}
-export function groupSeancePubliqueBySlot(events, dossierBySenatUrl) {
-    const out = {};
-    const ensureBucket = (slot) => (out[slot] ??= []);
-    if (!events?.length)
-        return out;
-    const sp = events.filter((e) => isSeancePublique(e?.type));
-    if (sp.length === 0)
-        return out;
-    const byDate = new Map();
-    for (const e of sp) {
-        const d = norm(e.date);
-        if (!d)
-            continue;
-        if (!byDate.has(d))
-            byDate.set(d, []);
-        byDate.get(d).push(e);
-    }
-    // Pour chaque date : enrichir, bucketiser par slot, puis pousser dans out[slot]
-    for (const [date, dayEvents] of byDate) {
-        const enriched = dayEvents.map((e) => {
-            const { startISO, endISO, slot } = deriveTimesForEvent(e);
-            return { ev: e, startISO, endISO, slot };
-        });
-        // tri par heure de début connue
-        enriched.sort((a, b) => {
-            const da = a.startISO ? (parseISO(a.startISO)?.toMillis() ?? Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER;
-            const db = b.startISO ? (parseISO(b.startISO)?.toMillis() ?? Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER;
-            return da - db;
-        });
-        // Bucket par slot (en déduisant le slot UNKNOWN via l'heure si possible)
-        const bySlot = new Map();
-        for (const it of enriched) {
-            let s = it.slot;
-            if (s === "UNKNOWN" && it.startISO) {
-                const dt = parseISO(it.startISO);
-                if (dt)
-                    s = slotOf(dt);
-            }
-            if (s === "UNKNOWN")
-                continue; // on écarte les inconnus résiduels (option : créer un bucket "UNKNOWN")
-            if (!bySlot.has(s))
-                bySlot.set(s, []);
-            bySlot.get(s).push(it);
-        }
-        // Construire les GroupedReunion et les pousser dans out[slot]
-        for (const [slot, list] of bySlot) {
-            const sorted = list.slice().sort((a, b) => {
-                const da = a.startISO ? (parseISO(a.startISO)?.toMillis() ?? Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER;
-                const db = b.startISO ? (parseISO(b.startISO)?.toMillis() ?? Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER;
-                return da - db;
-            });
-            const startTime = sorted.find((x) => !!x.startISO)?.startISO ?? null;
-            const endTime = sorted.reduce((acc, x) => {
-                const de = x.endISO ? parseISO(x.endISO)?.toMillis() : null;
-                const accMs = acc ? parseISO(acc)?.toMillis() : null;
-                if (de != null && (accMs == null || de > accMs))
-                    return x.endISO;
-                return acc;
-            }, null);
-            const titres = sorted.map((x) => x.ev.titre || "").filter(Boolean);
-            const captationVideo = sorted.some((x) => x.ev.captationVideo === true);
-            const eventsForSlot = sorted.map((x) => x.ev);
-            ensureBucket(slot).push({
-                uid: makeGroupUid(date, slot),
-                chambre: "SN",
-                date,
-                slot,
-                type: "Séance publique",
-                startTime,
-                endTime,
-                captationVideo,
-                organe: "Séance publique",
-                titre: compactTitleList(titres, 5),
-                objet: joinObjets(sorted.map((x) => x.ev)),
-                events: sorted.map((x) => x.ev),
-                odj: buildOdj(eventsForSlot, dossierBySenatUrl),
-            });
-        }
-    }
-    // Tri interne de chaque créneau (cohérent avec groupNonSPByTypeOrganeHour)
-    for (const s of Object.keys(out)) {
-        out[s].sort((a, b) => {
-            const da = DateTime.fromISO(`${a.date}T${a.startTime || "00:00:00.000+02:00"}`, { zone: PARIS }).toMillis();
-            const db = DateTime.fromISO(`${b.date}T${b.startTime || "00:00:00.000+02:00"}`, { zone: PARIS }).toMillis();
-            // puis par nom de slot pour stabilité (facultatif)
-            return da - db || (a.slot || "UNKNOWN").localeCompare(b.slot || "UNKNOWN");
-        });
-    }
-    return out;
-}
-function normalizeNoAccents(s) {
-    return (s || "")
-        .trim()
-        .normalize("NFKD")
-        .replace(/[\u0300-\u036f]/g, "");
-}
-function isSeancePublique(typeLabel) {
-    const s = normalizeNoAccents(typeLabel || "").toLowerCase();
-    return /\bseance\b.*\bpublique\b/.test(s);
-}
-function classifyAgendaType(typeLabel) {
-    const s = normalizeNoAccents(typeLabel || "").toLowerCase();
-    if (/\bseance\b.*\bpublique\b/.test(s))
-        return "SP";
-    if (/\bcommissions\b/.test(s))
-        return "COM";
-    if (/\bmission\b.*\bcontrole\b/.test(s))
-        return "MC";
-    if (/\boffices\b|\bdelegations\b/.test(s))
-        return "OD";
-    if (/\instances\b|\decisionelles\b/.test(s))
-        return "ID";
-    return null;
-}
-function typeToSuffixStrict(kind) {
-    switch (kind) {
-        case "SP":
-            return "IDS";
-        case "COM":
-            return "IDC";
-        case "MC":
-            return "IDM";
-        case "OD":
-            return "IDO";
-        case "ID":
-            return "IDI";
-    }
-}
-function organeInitials(input, maxLen = 8) {
-    if (!input)
-        return "";
-    const clean = normalizeNoAccents(input)
-        .replace(/['’]/g, " ")
-        .replace(/[^A-Za-z0-9\s]/g, " ")
-        .replace(/\s+/g, " ")
-        .trim();
-    if (!clean)
-        return "";
-    const parts = clean.split(" ");
-    const letters = [];
-    for (const raw of parts) {
-        const w = raw.toLowerCase();
-        if (!w)
-            continue;
-        if (STOPWORDS.has(w))
-            continue;
-        // Take two first letter if alphanumeric
-        const two = raw.slice(0, 2);
-        if (/[A-Za-z0-9]/.test(two))
-            letters.push(two.toUpperCase());
-    }
-    const out = letters.join("");
-    return out.slice(0, maxLen);
-}
-export function makeTypeGroupUid(dateISO, kind, agendaEventId, organe) {
-    const ymd = dateISO ? formatYYYYMMDD(dateISO) : "00000000";
-    const suffix = typeToSuffixStrict(kind);
-    const org = organe ? organeInitials(organe) : "";
-    let base = `RUSN${ymd}${suffix}${org ? org : ""}${agendaEventId}`;
-    return base;
-}
-function parseISO(isoLike) {
-    if (!isoLike)
-        return null;
-    const dt = DateTime.fromISO(isoLike, { zone: PARIS });
-    return dt.isValid ? dt : null;
-}
-function slotOf(dt) {
-    if (!dt)
-        return "UNKNOWN";
-    const h = dt.hour + dt.minute / 60;
-    if (h < 12.5)
-        return "MATIN";
-    if (h < 19.0)
-        return "APRES-MIDI";
-    return "SOIR";
-}
-function trimWords(s, max = 40) {
-    const words = norm(s).split(/\s+/).filter(Boolean);
-    return words.length <= max ? words.join(" ") : words.slice(0, max).join(" ");
-}
-function compactTitleList(titres, maxTitles = 5) {
-    const uniq = Array.from(new Set(titres.map((t) => norm(t)).filter(Boolean)));
-    return uniq.slice(0, maxTitles).join(" · ") || "(sans titre)";
-}
-export function makeGroupUid(date, slot) {
-    const ymd = date ? formatYYYYMMDD(date) : "00000000";
-    return `RUSN${ymd}IDS-${slot}`;
-}
-export function formatYYYYMMDD(dateYYYYMMDD) {
-    const [y, m, d] = dateYYYYMMDD.split("-");
-    return `${y}${m}${d}`;
-}
-export function makeReunionUid(agenda) {
-    const ymd = agenda.date ? formatYYYYMMDD(agenda.date) : "00000000";
-    return `${ymd}-${agenda.id}`;
-}
-function joinObjets(events) {
-    const objets = events
-        .map((e) => (e.objet || "").trim())
-        .filter(Boolean)
-        .map((s) => trimWords(s, 40));
-    if (objets.length === 0)
-        return "";
-    return objets.join(" · ");
-}
-// Extract hours/minutes from French text like "à 10 h 30", "de 10 h à 12 h", etc.
-function parseTimeOriginalFR(timeOriginal) {
-    if (!timeOriginal)
-        return { start: null, end: null };
-    const txt = (timeOriginal || "")
-        .replace(/\u00A0/g, " ") // nbsp → space
-        .replace(/\s+/g, " ") // espaces multiples
-        .toLowerCase()
-        .trim();
-    // 1) "de 10 h 30 à 12 heures", "de 10h30 à 12h", "de 9 h à 11 h 15", etc.
-    const reRange = /\bde\s+(\d{1,2})\s*(?:h|:)?\s*(\d{1,2})?\s*(?:heures?)?\s*à\s*(\d{1,2})\s*(?:h|:)?\s*(\d{1,2})?\s*(?:heures?)?/i;
-    const mRange = txt.match(reRange);
-    if (mRange) {
-        const h1 = clampHour(+mRange[1]), m1 = clampMinute(mRange[2] ? +mRange[2] : 0);
-        const h2 = clampHour(+mRange[3]), m2 = clampMinute(mRange[4] ? +mRange[4] : 0);
-        return { start: toIsoTime(h1, m1), end: toIsoTime(h2, m2) };
-    }
-    // 2) "à 10 h 30", "à 10h", "A 10h30", "A 9 heures", etc.
-    const reAt = /\b(?:a|à)\s*(\d{1,2})\s*(?:h|:)?\s*(\d{1,2})?\s*(?:heures?)?/i;
-    const mAt = txt.match(reAt);
-    if (mAt) {
-        const h = clampHour(+mAt[1]), m = clampMinute(mAt[2] ? +mAt[2] : 0);
-        return { start: toIsoTime(h, m), end: null };
-    }
-    // 3) "10 h 30", "15h", "9 heures" sans 'à' / 'de ... à ...'
-    const reBare = /\b(\d{1,2})\s*(?:h|:)?\s*(\d{1,2})?\s*(?:heures?)?\b/;
-    const mBare = txt.match(reBare);
-    if (mBare) {
-        const h = clampHour(+mBare[1]), m = clampMinute(mBare[2] ? +mBare[2] : 0);
-        return { start: toIsoTime(h, m), end: null };
-    }
-    return { start: null, end: null };
-}
-function clampHour(h) {
-    return Math.max(0, Math.min(23, h));
-}
-function clampMinute(m) {
-    return Math.max(0, Math.min(59, m));
-}
-function toIsoTime(h, m) {
-    return `${String(h).padStart(2, "0")}:${String(m).padStart(2, "0")}:00.000+02:00`;
-}
-function slotFromTimesOrText(startISO, timeOriginal) {
-    if (startISO) {
-        const dt = parseISO(startISO);
-        if (dt)
-            return slotOf(dt);
-    }
-    const t = (timeOriginal || "").toLowerCase();
-    if (/\b(apr(?:è|e)s[-\s]?midi)\b/.test(t))
-        return "APRES-MIDI";
-    if (/\b(soir(?:ée)?)\b/.test(t))
-        return "SOIR";
-    if (/\b(matin(?:ée)?)\b/.test(t))
-        return "MATIN";
-    return "UNKNOWN";
-}
-function deriveTimesForEvent(ev) {
-    const directStart = ev.startTime ?? null;
-    const directEnd = ev.endTime ?? null;
-    const fromText = parseTimeOriginalFR(ev.timeOriginal);
-    const startISO = directStart ?? fromText.start ?? null;
-    const endISO = directEnd ?? fromText.end ?? null;
-    const slot = slotFromTimesOrText(startISO, ev.timeOriginal);
-    return { startISO, endISO, slot };
-}

package/lib/utils/reunion_odj_building.d.ts

@@ -1,5 +0,0 @@
-import commandLineArgs from "command-line-args";
-import { DossierLegislatifResult } from "../model/dosleg";
-import { AgendaEvent, ReunionOdj } from "../types/agenda";
-export declare function buildOdj(events: AgendaEvent[], dossierBySenatUrl: Record<string, DossierLegislatifResult>): ReunionOdj | undefined;
-export declare function buildSenatDossierIndex(options: commandLineArgs.CommandLineOptions): Record<string, DossierLegislatifResult>;

package/lib/utils/reunion_odj_building.js

@@ -1,154 +0,0 @@
-import { getSessionsFromStart } from "../types/sessions";
-import { iterLoadSenatDossiersLegislatifs } from "../loaders";
-export function buildOdj(events, dossierBySenatUrl) {
-    const byObjet = new Map(); // objet -> set de dossier uids
-    let codeEtape = null;
-    let dossier = null;
-    for (const ev of events) {
-        const objetKey = (ev.objet ?? "").trim();
-        const url = normalizeSenatUrl(ev.urlDossierSenat) ?? undefined;
-        dossier = url ? dossierBySenatUrl[url] : null;
-        const dossierUid = dossier ? pickDossierUid(dossier) : undefined;
-        codeEtape = dossier ? computeCodeEtape(ev, dossier) : null;
-        // si on n’a ni objet ni dossier, ça ne sert à rien de créer un point
-        if (!objetKey && !dossierUid)
-            continue;
-        if (!byObjet.has(objetKey) && dossierUid) {
-            byObjet.set(objetKey, dossierUid);
-        }
-    }
-    if (byObjet.size === 0)
-        return undefined;
-    const pointsOdj = [];
-    for (const [objetKey, dossierUid] of byObjet) {
-        pointsOdj.push({
-            objet: objetKey || null,
-            dossierLegislatifRef: dossierUid || null,
-            codeEtape,
-        });
-    }
-    return { pointsOdj };
-}
-function pickDossierUid(d) {
-    if (d["signet"] && d["signet"].trim())
-        return d["signet"].trim();
-    if (d["code"] && String(d["code"]).trim())
-        return String(d["code"]).trim();
-    return undefined;
-}
-function normalizeSenatUrl(url) {
-    if (!url)
-        return null;
-    let u = url.trim();
-    if (!u)
-        return null;
-    if (!/^https?:\/\//i.test(u))
-        return u;
-    // force https://
-    u = u.replace(/^http:\/\//i, "https://");
-    u = u.replace(/\/+$/, "");
-    return u;
-}
-export function buildSenatDossierIndex(options) {
-    const index = {};
-    const sessions = getSessionsFromStart(2015);
-    for (const session of sessions) {
-        for (const item of iterLoadSenatDossiersLegislatifs(options["dataDir"], session)) {
-            const dossier = item.item;
-            const url = dossier["url"] ? normalizeSenatUrl(dossier["url"]) : undefined;
-            if (url)
-                index[url] = dossier;
-        }
-    }
-    return index;
-}
-function detectLecture(objet) {
-    objet = objet.toLowerCase();
-    if (objet.includes("première lecture"))
-        return 1;
-    if (objet.includes("deuxième lecture") || objet.includes("2ème"))
-        return 2;
-    if (objet.includes("troisième lecture") || objet.includes("3ème"))
-        return 3;
-    return undefined;
-}
-function computeCodeEtape(ev, dossier) {
-    // In order to match with stage, we need to remove the '-SEANCE' suffix from the codeActe
-    const cleanCode = (code) => code.replace(/-SEANCE$/, "");
-    const lecture = detectLecture(ev.objet ?? "");
-    const organe = ev.organe ?? "";
-    const nature = organe.toLowerCase().includes("commission")
-        ? "COM"
-        : organe.toLowerCase().includes("séance publique")
-            ? "DEBATS"
-            : "";
-    const evDate = ev.date.split("T")[0];
-    const flat = buildFlatActes(dossier);
-    // 1) Strict matching: same date + same nature
-    let candidates = flat.filter((a) => {
-        if (a.date !== evDate)
-            return false;
-        if (nature && !a.codeActe.includes(nature))
-            return false;
-        return true;
-    });
-    // If a specific lecture is detected in the agenda event, refine the candidates
-    if (lecture !== undefined && candidates.length > 0) {
-        const withLecture = candidates.filter((c) => c.ordreLecture === lecture);
-        if (withLecture.length > 0) {
-            candidates = withLecture;
-        }
-    }
-    if (candidates.length > 0) {
-        // Multiple candidates: pick the most specific one (longest code string)
-        candidates.sort((a, b) => b.codeActe.length - a.codeActe.length);
-        return cleanCode(candidates[0].codeActe);
-    }
-    // 2) Fallback COM: If no exact date match for a commission event,
-    // take the latest commission act for this lecture on or before the event date.
-    if (nature === "COM") {
-        let comActs = flat.filter((a) => a.codeActe.includes("COM") && a.date <= evDate);
-        if (lecture !== undefined) {
-            const byLecture = comActs.filter((a) => a.ordreLecture === lecture);
-            if (byLecture.length > 0)
-                comActs = byLecture;
-        }
-        if (comActs.length > 0) {
-            comActs.sort((a, b) => b.date.localeCompare(a.date) || b.codeActe.length - a.codeActe.length);
-            return cleanCode(comActs[0].codeActe);
-        }
-    }
-    // 3) Fallback general lecture: if nothing else worked but a lecture is identified,
-    // find any act belonging to that lecture (e.g., SN1-DEPOT).
-    if (lecture !== undefined) {
-        const genericActe = flat.find((a) => a.ordreLecture === lecture);
-        if (genericActe) {
-            return cleanCode(genericActe.codeActe);
-        }
-    }
-    console.log(`✖ No stage code found for ev=${ev.id} (Date: ${evDate}, Nature: ${nature}, Lecture: ${lecture})`, {
-        totalActsInDossier: dossier["actes_legislatifs"]?.length || 0,
-        firstActDate: flat[0]?.date,
-    });
-    return null;
-}
-function buildFlatActes(dossier) {
-    const actes = dossier["actes_legislatifs"] ?? [];
-    const res = [];
-    for (const acte of actes) {
-        if (acte["chambre"] !== "SN")
-            continue;
-        const codeActe = acte.code_acte;
-        const dateActe = acte.date?.split("T")[0];
-        if (!codeActe || !dateActe)
-            continue;
-        const match = codeActe.match(/^(?:SN|AN)(\d+)/);
-        const ordreLecture = match ? parseInt(match[1], 10) : undefined;
-        res.push({
-            codeActe,
-            date: dateActe,
-            ordreLecture,
-        });
-    }
-    return res;
-}

package/lib/utils/reunion_parsing.d.ts

@@ -1,23 +0,0 @@
-import { DateTime } from "luxon";
-import { AgendaEvent, Reunion } from "../types/agenda";
-import { DossierLegislatifResult } from "../model/dosleg";
-import * as cheerio from "cheerio";
-type KnownType = "SP" | "COM" | "MC" | "OD" | "ID";
-type DossierBySenatUrl = Record<string, DossierLegislatifResult>;
-type ReunionBucket = "IDS" | "IDC" | "IDM" | "IDO" | "IDI";
-type ReunionsByBucket = Record<ReunionBucket, Reunion[]>;
-export declare function buildReunionsByBucket(events: AgendaEvent[], dossierBySenatUrl: DossierBySenatUrl): ReunionsByBucket;
-export declare function makeReunionUid(dateISO: string, kind: KnownType, agendaEventId: string, organe?: string | null): string;
-export declare function formatYYYYMMDD(dateYYYYMMDD: string): string;
-export declare function deriveTimesForEvent(ev: AgendaEvent): {
-    startISO: string | null;
-    endISO: string | null;
-};
-export type SommaireBlock = {
-    text: string;
-    startIndex: number;
-    targetId?: string | null;
-};
-export declare function extractSommaireBlocks($: cheerio.CheerioAPI, idx: Map<any, number>): SommaireBlock[];
-export declare function parseISO(iso: string | null | undefined): DateTime | null;
-export {};