@tricoteuses/senat 3.1.22 → 3.1.24

package/lib/src/loaders.d.ts

@@ -1,52 +0,0 @@
-import { AmendementResult } from "./model/ameli.js";
-import { DebatResult } from "./model/debats.js";
-import { DossierLegislatifResult } from "./model/dosleg.js";
-import { QuestionResult } from "./model/questions.js";
-import { ScrutinResult } from "./model/scrutins.js";
-import { CirconscriptionResult, OrganismeResult, SenateurResult } from "./model/sens.js";
-import { Reunion } from "./rich_types/agenda.js";
-import { FlatTexte, DocumentMetadata } from "./rich_types/texte.js";
-import { CompteRendu } from "./rich_types/compte_rendu.js";
-import { DocumentResult } from "./model/documents.js";
-export { EnabledDatasets } from "./datasets.js";
-export type { DocumentResult } from "./model/documents.js";
-export declare const AGENDA_FOLDER = "agenda";
-export declare const COMPTES_RENDUS_FOLDER = "seances";
-export declare const COMMISSION_FOLDER = "commissions";
-export declare const DOSLEG_DOSSIERS_FOLDER = "dossiers";
-export declare const ENRICHED_TEXTE_FOLDER = "leg_enrichi";
-export declare const SCRUTINS_FOLDER = "scrutins";
-export declare const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
-export declare const SENS_ORGANISMES_FOLDER = "organismes";
-export declare const SENS_SENATEURS_FOLDER = "senateurs";
-export declare const TEXTE_FOLDER = "leg";
-export declare const RAPPORT_FOLDER = "rap";
-export declare const DATA_ORIGINAL_FOLDER = "original";
-export declare const DATA_TRANSFORMED_FOLDER = "transformed";
-export declare const DOCUMENT_METADATA_FILE = "metadata.json";
-export type IterItem<T> = {
-    item: T;
-    filePathFromDataset?: string;
-    legislature?: number;
-    gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
-};
-export declare function iterFilePaths(dirPath: string): Generator<string>;
-export declare function iterLoadSenatAmendements(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<AmendementResult>>;
-export declare function iterLoadSenatDebats(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DebatResult>>;
-export declare function iterLoadSenatComptesRendusSeances(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<CompteRendu>>;
-export declare function iterLoadSenatComptesRendusCommissions(dataDir: string, session: number, options?: {}): Generator<IterItem<CompteRendu>>;
-export declare function iterLoadSenatDossiersLegislatifs(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifResult>>;
-export declare function iterLoadSenatRapportUrls(dataDir: string, session: number | undefined): Generator<IterItem<DocumentMetadata>>;
-export declare function iterLoadSenatTexteUrls(dataDir: string, session: number | undefined): Generator<IterItem<DocumentMetadata>>;
-export declare function iterLoadSenatRapports(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DocumentResult>>;
-export declare function iterLoadSenatTextes(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DocumentResult & Partial<FlatTexte>>>;
-export declare function loadSenatTexteContent(dataDir: string, session: number | string | null | undefined, texteId: string): IterItem<FlatTexte | null>;
-export declare function loadSenatCompteRenduContent(dataDir: string, session: number, debatId: string | number): {
-    item: CompteRendu | null;
-};
-export declare function iterLoadSenatAgendas(dataDir: string, session: number | undefined): Generator<IterItem<Reunion>>;
-export declare function iterLoadSenatCirconscriptions(dataDir: string, options?: {}): Generator<IterItem<CirconscriptionResult>>;
-export declare function iterLoadSenatOrganismes(dataDir: string, options?: {}): Generator<IterItem<OrganismeResult>>;
-export declare function iterLoadSenatSenateurs(dataDir: string, options?: {}): Generator<IterItem<SenateurResult>>;
-export declare function iterLoadSenatQuestions(dataDir: string, legislature: number, options?: {}): Generator<IterItem<QuestionResult>>;
-export declare function iterLoadSenatScrutins(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<ScrutinResult>>;

package/lib/src/loaders.js

@@ -1,260 +0,0 @@
-import fsex from "fs-extra";
-import fs from "fs";
-import path from "path";
-import * as git from "./git.js";
-import { datasets } from "./datasets.js";
-import { UNDEFINED_SESSION } from "./rich_types/sessions.js";
-export { EnabledDatasets } from "./datasets.js";
-export const AGENDA_FOLDER = "agenda";
-export const COMPTES_RENDUS_FOLDER = "seances";
-export const COMMISSION_FOLDER = "commissions";
-export const DOSLEG_DOSSIERS_FOLDER = "dossiers";
-export const ENRICHED_TEXTE_FOLDER = "leg_enrichi";
-export const SCRUTINS_FOLDER = "scrutins";
-export const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
-export const SENS_ORGANISMES_FOLDER = "organismes";
-export const SENS_SENATEURS_FOLDER = "senateurs";
-export const TEXTE_FOLDER = "leg";
-export const RAPPORT_FOLDER = "rap";
-export const DATA_ORIGINAL_FOLDER = "original";
-export const DATA_TRANSFORMED_FOLDER = "transformed";
-export const DOCUMENT_METADATA_FILE = "metadata.json";
-export function* iterFilePaths(dirPath) {
-    if (dirPath && fs.existsSync(dirPath)) {
-        const files = fs.readdirSync(dirPath, {
-            withFileTypes: true,
-            recursive: true,
-        });
-        for (const file of files) {
-            if (file.isFile()) {
-                yield path.join(file.parentPath, file.name);
-            }
-        }
-    }
-}
-function* iterLoadSenatItems(dataDir, dataName, legislatureOrSession, subDir, { log = false, sinceCommit } = {}) {
-    let itemsDir = path.join(dataDir, dataName);
-    if (subDir) {
-        itemsDir = path.join(itemsDir, subDir);
-    }
-    if (legislatureOrSession) {
-        itemsDir = path.join(itemsDir, String(legislatureOrSession));
-    }
-    // Get changed files if sinceCommit is specified (excluding deleted files)
-    const changedFiles = sinceCommit
-        ? git.getChangedFilesSinceCommit(itemsDir, sinceCommit, {
-            diffFilter: "AMR", // Added, Modified, Renamed
-        })
-        : null;
-    if (log && sinceCommit) {
-        console.log(`Filtering files changed since commit ${sinceCommit} in ${itemsDir}`);
-        console.log(`Found ${changedFiles?.size || 0} changed files (AMR)`);
-    }
-    for (const filePath of iterFilePaths(itemsDir)) {
-        if (!filePath.endsWith(".json")) {
-            continue;
-        }
-        const relativePath = path.relative(path.join(dataDir, dataName), filePath);
-        const gitStatus = changedFiles?.get(relativePath);
-        // Filter by changed files if sinceCommit is specified
-        if (changedFiles && !gitStatus) {
-            // Skip files not in the change set
-            continue;
-        }
-        if (log) {
-            console.log(`Loading file: ${filePath}…${gitStatus ? ` (${gitStatus})` : ""}`);
-        }
-        let item;
-        try {
-            const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
-            item = JSON.parse(itemJson);
-        }
-        catch (error) {
-            const err = error;
-            console.warn(`[iterLoadSenatItems] skipped invalid JSON: ${filePath} (${err.message})`);
-            continue;
-        }
-        const filePathFromDataset = filePath.substring(filePath.indexOf(dataName) + dataName.length);
-        yield {
-            item,
-            filePathFromDataset,
-            legislature: legislatureOrSession,
-            ...(gitStatus && { gitStatus }), // Include gitStatus
-        };
-    }
-    // Yield deleted files at the end if sinceCommit is specified
-    if (sinceCommit) {
-        const deletedFiles = git.getChangedFilesSinceCommit(itemsDir, sinceCommit, {
-            diffFilter: "D", // Deleted
-        });
-        if (log) {
-            console.log(`Found ${deletedFiles.size || 0} deleted files (D)`);
-        }
-        for (const [relativePath, status] of deletedFiles.entries()) {
-            const deletedFilePath = path.join(itemsDir, relativePath);
-            if (log) {
-                console.log(`Deleted file: ${deletedFilePath}`);
-            }
-            // Extract UID from filename (remove extension) for the placeholder item
-            const fileExtension = path.extname(relativePath) || ".json"; // Assuming files use an extension like .json
-            const filename = path.basename(relativePath, fileExtension);
-            const fakeItem = { uid: filename }; // Placeholder item using uid constraint
-            const filePathFromDataset = deletedFilePath.substring(deletedFilePath.indexOf(dataName) + dataName.length);
-            yield {
-                item: fakeItem,
-                filePathFromDataset,
-                legislature: legislatureOrSession,
-                gitStatus: status,
-            };
-        }
-    }
-}
-export function* iterLoadSenatAmendements(dataDir, session, options = {}) {
-    for (const amendementItem of iterLoadSenatItems(dataDir, datasets.ameli.database, session, undefined, options)) {
-        yield amendementItem;
-    }
-}
-export function* iterLoadSenatDebats(dataDir, session, options = {}) {
-    for (const debatItem of iterLoadSenatItems(dataDir, datasets.debats.database, session, undefined, options)) {
-        yield debatItem;
-    }
-}
-export function* iterLoadSenatComptesRendusSeances(dataDir, session, options = {}) {
-    for (const compteRenduItem of iterLoadSenatItems(dataDir, COMPTES_RENDUS_FOLDER, session, DATA_TRANSFORMED_FOLDER, options)) {
-        yield compteRenduItem;
-    }
-}
-export function* iterLoadSenatComptesRendusCommissions(dataDir, session, options = {}) {
-    for (const compteRenduItem of iterLoadSenatItems(dataDir, COMMISSION_FOLDER, session, DATA_TRANSFORMED_FOLDER, options)) {
-        yield compteRenduItem;
-    }
-}
-export function* iterLoadSenatDossiersLegislatifs(dataDir, session, options = {}) {
-    for (const dossierLegislatifItem of iterLoadSenatItems(dataDir, datasets.dosleg.database, session, DOSLEG_DOSSIERS_FOLDER, options)) {
-        yield dossierLegislatifItem;
-    }
-}
-export function* iterLoadSenatRapportUrls(dataDir, session) {
-    let itemsDir = path.join(dataDir, RAPPORT_FOLDER, DATA_ORIGINAL_FOLDER);
-    if (session) {
-        itemsDir = path.join(itemsDir, session.toString());
-    }
-    for (const filePath of iterFilePaths(itemsDir)) {
-        const parsedFilePath = path.parse(filePath);
-        if (parsedFilePath.base === DOCUMENT_METADATA_FILE) {
-            const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
-            const item = JSON.parse(itemJson);
-            yield {
-                item,
-            };
-        }
-    }
-}
-export function* iterLoadSenatTexteUrls(dataDir, session) {
-    let itemsDir = path.join(dataDir, TEXTE_FOLDER, DATA_ORIGINAL_FOLDER);
-    if (session) {
-        itemsDir = path.join(itemsDir, session.toString());
-    }
-    for (const filePath of iterFilePaths(itemsDir)) {
-        const parsedFilePath = path.parse(filePath);
-        if (parsedFilePath.base === DOCUMENT_METADATA_FILE) {
-            const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
-            const item = JSON.parse(itemJson);
-            yield {
-                item,
-            };
-        }
-    }
-}
-export function* iterLoadSenatRapports(dataDir, session, options = {}) {
-    for (const iterItem of iterLoadSenatItems(dataDir, RAPPORT_FOLDER, session, "original", options)) {
-        if (iterItem.item?.["id"]) {
-            yield iterItem;
-        }
-    }
-}
-export function* iterLoadSenatTextes(dataDir, session, options = {}) {
-    for (const iterItem of iterLoadSenatItems(dataDir, TEXTE_FOLDER, session, DATA_ORIGINAL_FOLDER, options)) {
-        if (!iterItem.item?.["id"]) {
-            continue;
-        }
-        const texteItem = iterItem;
-        const texte = texteItem.item;
-        const texteId = texte["id"];
-        if (!texteId) {
-            continue;
-        }
-        const { item: texteContent } = loadSenatTexteContent(dataDir, texte["session"], texteId);
-        if (texteContent) {
-            texteItem.item = { ...texteContent, ...texteItem.item };
-        }
-        yield texteItem;
-    }
-}
-export function loadSenatTexteContent(dataDir, session, texteId) {
-    const fullTextePath = path.join(dataDir, TEXTE_FOLDER, DATA_TRANSFORMED_FOLDER, String(session ?? UNDEFINED_SESSION), texteId, `${texteId}.json`);
-    if (!fs.existsSync(fullTextePath)) {
-        return { item: null };
-    }
-    const texteJson = fs.readFileSync(fullTextePath, { encoding: "utf8" });
-    return { item: JSON.parse(texteJson) };
-}
-export function loadSenatCompteRenduContent(dataDir, session, debatId) {
-    const fullPath = path.join(dataDir, COMPTES_RENDUS_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${debatId}.json`);
-    if (!fs.existsSync(fullPath)) {
-        return { item: null };
-    }
-    const json = fs.readFileSync(fullPath, { encoding: "utf8" });
-    return { item: JSON.parse(json) };
-}
-export function* iterLoadSenatAgendas(dataDir, session) {
-    const baseDir = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session ?? ""));
-    if (!fs.existsSync(baseDir))
-        return;
-    const files = (fs.readdirSync(baseDir) || []).filter((f) => f.startsWith("RUSN") && f.endsWith(".json")).sort();
-    for (const fileName of files) {
-        const filePath = path.join(baseDir, fileName);
-        let raw;
-        try {
-            raw = fsex.readJSONSync(filePath);
-        }
-        catch {
-            continue; // JSON invalide
-        }
-        if (!raw || typeof raw !== "object")
-            continue;
-        const gr = raw;
-        if (!gr.uid || !gr.date || !gr.titre)
-            continue;
-        const reunion = {
-            ...gr,
-            events: Array.isArray(gr.events) ? gr.events : [],
-        };
-        yield { item: reunion };
-    }
-}
-export function* iterLoadSenatCirconscriptions(dataDir, options = {}) {
-    for (const circonscriptionItem of iterLoadSenatItems(dataDir, datasets.sens.database, undefined, SENS_CIRCONSCRIPTIONS_FOLDER, options)) {
-        yield circonscriptionItem;
-    }
-}
-export function* iterLoadSenatOrganismes(dataDir, options = {}) {
-    for (const organismeItem of iterLoadSenatItems(dataDir, datasets.sens.database, undefined, SENS_ORGANISMES_FOLDER, options)) {
-        yield organismeItem;
-    }
-}
-export function* iterLoadSenatSenateurs(dataDir, options = {}) {
-    for (const senateurItem of iterLoadSenatItems(dataDir, datasets.sens.database, undefined, SENS_SENATEURS_FOLDER, options)) {
-        yield senateurItem;
-    }
-}
-export function* iterLoadSenatQuestions(dataDir, legislature, options = {}) {
-    for (const questionItem of iterLoadSenatItems(dataDir, datasets.questions.database, legislature, undefined, options)) {
-        yield questionItem;
-    }
-}
-export function* iterLoadSenatScrutins(dataDir, session, options = {}) {
-    for (const scrutinItem of iterLoadSenatItems(dataDir, "scrutins", session, undefined, options)) {
-        yield scrutinItem;
-    }
-}

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

@@ -1,6 +0,0 @@
-import { AgendaEvent } from "../rich_types/agenda.js";
-export declare function getStartAndEndTimes(timeStr: string | null | undefined, dateISO: string): {
-    startTime: string | null;
-    endTime: string | null;
-};
-export declare function parseAgendaFromFile(htmlFilePath: string): Promise<AgendaEvent[] | null>;

package/lib/src/model/agenda.js

@@ -1,148 +0,0 @@
-import { JSDOM } from "jsdom";
-import { DateTime } from "luxon";
-import path from "path";
-import { ID_DATE_FORMAT, STANDARD_DATE_FORMAT } from "../scripts/datautil.js";
-const FR_TZ = "Europe/Paris";
-function eventIsSeance(eventElement) {
-    return eventElement.classList.contains("evt-seance");
-}
-function getEventType(eventClasses) {
-    const typeClass = [...eventClasses].find((className) => className.startsWith("evt-")) || null;
-    switch (typeClass) {
-        case "evt-seance":
-            return "Séance publique";
-        case "evt-instanz":
-            return "Commissions";
-        case "evt-cemi":
-            return "Mission de contrôle";
-        case "evt-deleg":
-            return "Offices et délégations";
-        case "evt-bureau":
-            return "Instances décisionnelles";
-    }
-    return null;
-}
-function getUrlDossierSenat(lienElements) {
-    const urlElement = [...lienElements].find((lienElement) => lienElement.textContent?.includes("dossier législatif"));
-    return urlElement ? urlElement.getAttribute("href") : null;
-}
-function getQuantieme(eventElement, seancesElements) {
-    const seanceIndex = seancesElements.indexOf(eventElement);
-    if (seancesElements.length === 1 && seanceIndex === 0) {
-        return "Unique";
-    }
-    else {
-        switch (seanceIndex) {
-            case 0:
-                return "Première";
-            case 1:
-                return "Deuxième";
-            case 2:
-                return "Troisième";
-            case 3:
-                return "Quatrième";
-            case 4:
-                return "Cinquième";
-        }
-    }
-    return "Non défini";
-}
-/**
- * Normalize time string to become a simple start time ("H'h'mm") or a duration ("'de 'H'h'mm' à 'H'h'mm").
- */
-function normalizeTime(timeStr) {
-    return timeStr
-        ?.replace(/^À l'issue de l'espace réservé .* et au plus tard\s/i, "") // Must be processed first
-        ?.replace(/^(?:le )?matin/i, "10h00") // We chose "matin" to mean 10h00
-        ?.replace(/^(?:l')?après-midi/i, "16h00") // We chose "après-midi" to mean 16h00
-        ?.replace(/^(?:le )?soir/i, "20h00") // We chose "soir" to mean 20h00
-        ?.replace(/^(?:la )?nuit/i, "22h00") // We chose "nuit" to mean 22h00
-        ?.replace(/^à\s/gi, "")
-        ?.replace(/heures/gi, "h00")
-        ?.replace(/\set.*/i, "")
-        ?.replace(/,.*/, "")
-        ?.replace(/\s\(hors hémicycle\)/i, "")
-        ?.replace(/\s*h\s*/gi, "h");
-}
-export function getStartAndEndTimes(timeStr, dateISO) {
-    const normalizedTime = normalizeTime(timeStr);
-    if (!normalizedTime) {
-        return { startTime: null, endTime: null };
-    }
-    const rangeMatch = normalizedTime.match(/^de (?<start>\d{1,2}h\d{2}) à (?<end>\d{1,2}h\d{2})$/i);
-    const toUtcTimeOnly = (value) => {
-        if (!value)
-            return null;
-        const time = DateTime.fromFormat(value, "H'h'mm", { zone: FR_TZ });
-        if (!time.isValid)
-            return null;
-        const local = DateTime.fromISO(dateISO, { zone: FR_TZ }).set({
-            hour: time.hour,
-            minute: time.minute,
-            second: 0,
-            millisecond: 0,
-        });
-        if (!local.isValid)
-            return null;
-        return local.toUTC().toFormat("HH:mm:ss.SSS'Z'");
-    };
-    if (rangeMatch?.groups) {
-        const { start, end } = rangeMatch.groups;
-        return {
-            startTime: toUtcTimeOnly(start),
-            endTime: toUtcTimeOnly(end),
-        };
-    }
-    return {
-        startTime: toUtcTimeOnly(normalizedTime),
-        endTime: null,
-    };
-}
-function transformAgenda(document, fileName) {
-    const agendaEvents = [];
-    const eventElements = document.querySelectorAll(".evt");
-    const seanceElements = Array.from(eventElements).filter((eventElement) => eventIsSeance(eventElement));
-    for (const eventElement of eventElements) {
-        const id = eventElement.previousElementSibling?.getAttribute("name") || null;
-        if (!id) {
-            continue;
-        }
-        const type = getEventType(eventElement.classList);
-        const date = DateTime.fromFormat(fileName, ID_DATE_FORMAT).toFormat(STANDARD_DATE_FORMAT);
-        const timeOriginal = eventElement.querySelector(".time")?.textContent || null;
-        const { startTime, endTime } = getStartAndEndTimes(timeOriginal, date);
-        const titre = eventElement.querySelector(".titre")?.textContent?.trim() || "";
-        const organe = eventElement.querySelector(".organe")?.textContent?.trim() || null;
-        const objet = eventElement.querySelector(".objet")?.textContent?.trim()?.replace(/^- /, "") || null;
-        const lieu = eventElement.querySelector(".lieu")?.textContent || null;
-        const videoElement = eventElement.querySelector(".video");
-        const urlDossierSenat = getUrlDossierSenat(eventElement.querySelectorAll(".lien a"));
-        agendaEvents.push({
-            id,
-            type,
-            date,
-            startTime,
-            endTime,
-            timeOriginal,
-            titre,
-            organe,
-            objet,
-            lieu,
-            captationVideo: videoElement !== null,
-            urlDossierSenat: urlDossierSenat,
-            quantieme: eventIsSeance(eventElement) ? getQuantieme(eventElement, seanceElements) : null,
-        });
-    }
-    return agendaEvents;
-}
-export async function parseAgendaFromFile(htmlFilePath) {
-    try {
-        const { document } = (await JSDOM.fromFile(htmlFilePath, { contentType: "text/html" })).window;
-        const fileName = path.parse(htmlFilePath).name;
-        return transformAgenda(document, fileName);
-    }
-    catch (error) {
-        console.error(`Could not parse texte with error ${error.message}`);
-    }
-    return null;
-}

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

@@ -1,67 +0,0 @@
-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;
-    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 findAllAmendements(fromSession?: number): AsyncGenerator<AmendementResult, void, unknown>;

package/lib/src/model/ameli.js

@@ -1,150 +0,0 @@
-import { streamUnsafeQuery } from "../databases_postgres.js";
-function buildFindAllAmendementsQuery(fromSession) {
-    const params = [];
-    const whereSession = fromSession === undefined ? "" : "where ses.ann >= $1";
-    if (fromSession !== undefined) {
-        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 ?? [],
-        };
-    }
-}