@tricoteuses/senat 2.5.9 → 2.6.1

package/README.md

@@ -1,5 +1,3 @@
-# This repository has been migrated to https://git.tricoteuses.fr/logiciels/tricoteuses-senat.
-
 # Tricoteuses-Senat
 
 ## _Retrieve, clean up & handle  French Sénat's open data_
@@ -59,17 +57,20 @@ npm run data:parse_textes_lois ../senat-data
 # Retrieval (& parsing) of agenda from Sénat's website
 npm run data:retrieve_agenda ../senat-data -- --fromSession 2022 [--parseAgenda]
 
+# Retrieval (& parsing) of comptes-rendus des débats from Sénat's website
+npm run data:retrieve_comptes_rendus ../senat-data -- [--parseDebats]
+
 # Retrieval of sénateurs' pictures from Sénat's website
 npm run data:retrieve_senateurs_photos ../senat-data
 ```
 
 ## Data download using Docker
 
-A Docker image that downloads and cleans the data all at once is available. Create and run it locally from the container registry:
+A Docker image that downloads and converts the data all at once is available. Build it locally or run it from the container registry.
+Use the environment variables `FROM_SESSION` and `CATEGORIES` if needed.
 
 ```bash
-docker volume create senat-data # Create a volume to download the data
-docker run --name tricoteuses-senat -v senat-data:/app/senat-data -d git.tricoteuses.fr/logiciels/tricoteuses-senat:latest
+docker run --pull always --name tricoteuses-senat -v ../senat-data:/app/senat-data -d git.tricoteuses.fr/logiciels/tricoteuses-senat:latest
 ```
 
 Use the environment variable `CATEGORIES` and `FROM_SESSION` if needed.

package/lib/databases.d.ts

@@ -1,20 +1,11 @@
 import { Kysely } from "kysely";
-import PgPromise from "pg-promise";
 import { DB as AmeliDatabase } from "./raw_types/ameli";
+import { DB as DebatsDatabase } from "./raw_types/debats";
 import { DB as DoslegDatabase } from "./raw_types/dosleg";
 import { DB as QuestionsDatabase } from "./raw_types/questions";
 import { DB as SensDatabase } from "./raw_types/sens";
-export declare const pgPromise: PgPromise.IMain<{}, import("pg-promise/typescript/pg-subset").IClient>;
-export declare const dbNames: string[];
-export declare const dbByName: {
-    [name: string]: any;
-};
 export declare const dbAmeli: Kysely<AmeliDatabase>;
+export declare const dbDebats: Kysely<DebatsDatabase>;
 export declare const dbDosleg: Kysely<DoslegDatabase>;
 export declare const dbQuestions: Kysely<QuestionsDatabase>;
 export declare const dbSens: Kysely<SensDatabase>;
-export declare let dbSharedConnectionObjectByName: {
-    [name: string]: PgPromise.IConnected<unknown, any>;
-};
-export declare function checkDatabase(name: string): Promise<any>;
-export declare function checkDatabases(): Promise<void>;

package/lib/databases.js

@@ -2,7 +2,6 @@ import { Kysely, PostgresDialect } from "kysely";
 import * as pg from "pg";
 import { types } from "pg";
 import Cursor from "pg-cursor";
-import PgPromise from "pg-promise";
 import config from "./config";
 import { datasets } from "./datasets";
 // Map int8 to number instead of string
@@ -10,18 +9,11 @@ import { datasets } from "./datasets";
 pg.types.setTypeParser(types.builtins.INT8, (val) => {
     return parseInt(val, 10);
 });
-export const pgPromise = PgPromise();
-export const dbNames = ["ameli", "debats", "dosleg"];
-export const dbByName = {};
-for (const name of dbNames) {
-    dbByName[name] = pgPromise({
-        database: name,
-        host: config.db.host,
-        password: config.db.password,
-        port: config.db.port,
-        user: config.db.user,
-    });
-}
+export const dbAmeli = createDb(datasets.ameli.database, datasets.ameli.schema);
+export const dbDebats = createDb(datasets.debats.database, datasets.debats.schema);
+export const dbDosleg = createDb(datasets.dosleg.database, datasets.dosleg.schema);
+export const dbQuestions = createDb(datasets.questions.database, datasets.questions.schema);
+export const dbSens = createDb(datasets.sens.database, datasets.sens.schema);
 function createDb(database, schema) {
     const dialect = new PostgresDialect({
         pool: new pg.Pool({
@@ -39,19 +31,3 @@ function createDb(database, schema) {
         dialect: dialect,
     }).withSchema(schema);
 }
-export const dbAmeli = createDb(datasets.ameli.database, datasets.ameli.schema);
-export const dbDosleg = createDb(datasets.dosleg.database, datasets.dosleg.schema);
-export const dbQuestions = createDb(datasets.questions.database, datasets.questions.schema);
-export const dbSens = createDb(datasets.sens.database, datasets.sens.schema);
-export let dbSharedConnectionObjectByName = {};
-export async function checkDatabase(name) {
-    // Check that database exists.
-    const db = dbByName[name];
-    dbSharedConnectionObjectByName[name] = await db.connect();
-    return db;
-}
-export async function checkDatabases() {
-    for (const name of dbNames) {
-        await checkDatabase(name);
-    }
-}

package/lib/index.d.ts

@@ -4,6 +4,7 @@ export type { QuestionResult, } from "./model/questions";
 export type { CirconscriptionResult, OrganismeResult, SenateurResult, } from "./model/sens";
 export type { AgendaEvent } from "./types/agenda";
 export type { Ses, Sub, TxtAmeli } from "./types/ameli";
+export type { CompteRendu } from "./types/compte_rendu";
 export type { Debat, LecAssDeb } from "./types/debats";
 export type { Ass, Aud, Auteur, DateSeance, DecCoc, DenRap, DocAtt, Ecr, EtaLoi, LecAss, LecAssRap, Lecture, Loi, Org, OriTxt, Qua, Rap, RapOrg, Scr, Texte, TypAtt, TypLec, TypLoi, TypTxt, TypUrl, } from "./types/dosleg";
 export type { Photo, Sen } from "./types/sens";

package/lib/loaders.d.ts

@@ -1,4 +1,5 @@
 import { AmendementResult } from "./model/ameli";
+import { DebatResult } from "./model/debats";
 import { DossierLegislatifResult } from "./model/dosleg";
 import { QuestionResult } from "./model/questions";
 import { CirconscriptionResult, OrganismeResult, SenateurResult } from "./model/sens";
@@ -6,6 +7,7 @@ import { AgendaEvent } from "./types/agenda";
 import { FlatTexte } from "./types/texte";
 export { EnabledDatasets } from "./datasets";
 export declare const AGENDA_FOLDER = "agenda";
+export declare const COMPTES_RENDUS_FOLDER = "seances";
 export declare const DOSLEG_DOSSIERS_FOLDER = "dossiers";
 export declare const RAPPORT_FOLDER = "rap";
 export declare const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
@@ -59,6 +61,7 @@ export interface DossierLegislatifDocumentResult {
 }
 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 iterLoadSenatDossiersLegislatifs(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifResult>>;
 export declare function iterLoadSenatDossiersLegislatifsRapportUrls(dataDir: string, session: number | undefined): Generator<IterItem<RapportMetadata>>;
 export declare function iterLoadSenatDossiersLegislatifsTexteUrls(dataDir: string, session: number | undefined): Generator<IterItem<TexteMetadata>>;
@@ -69,5 +72,5 @@ export declare function loadSenatTexteContent(dataDir: string, textePathFromData
 export declare function iterLoadSenatEvenements(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<AgendaEvent>>;
 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, legislature: number, options?: {}): Generator<IterItem<SenateurResult>>;
+export declare function iterLoadSenatSenateurs(dataDir: string, options?: {}): Generator<IterItem<SenateurResult>>;
 export declare function iterLoadSenatQuestions(dataDir: string, legislature: number, options?: {}): Generator<IterItem<QuestionResult>>;

package/lib/loaders.js

@@ -1,10 +1,10 @@
 import fs from "fs";
 import path from "path";
-import legislatures from "./legislatures.json";
 import { datasets } from "./datasets";
 import { UNDEFINED_SESSION } from "./types/sessions";
 export { EnabledDatasets } from "./datasets";
 export const AGENDA_FOLDER = "agenda";
+export const COMPTES_RENDUS_FOLDER = "seances";
 export const DOSLEG_DOSSIERS_FOLDER = "dossiers";
 export const RAPPORT_FOLDER = "rap";
 export const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
@@ -54,6 +54,11 @@ export function* iterLoadSenatAmendements(dataDir, session, 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* iterLoadSenatDossiersLegislatifs(dataDir, session, options = {}) {
     for (const dossierLegislatifItem of iterLoadSenatItems(dataDir, datasets.dosleg.database, session, DOSLEG_DOSSIERS_FOLDER, options)) {
         yield dossierLegislatifItem;
@@ -156,17 +161,8 @@ export function* iterLoadSenatOrganismes(dataDir, options = {}) {
         yield organismeItem;
     }
 }
-export function* iterLoadSenatSenateurs(dataDir, legislature, options = {}) {
-    const dateDebutLegislatureStr = legislatures.find((legislatureInfo) => legislatureInfo.numero === legislature)?.date_debut;
-    const dateDebutLegislature = new Date(dateDebutLegislatureStr);
+export function* iterLoadSenatSenateurs(dataDir, options = {}) {
     for (const senateurItem of iterLoadSenatItems(dataDir, datasets.sens.database, undefined, SENS_SENATEURS_FOLDER, options)) {
-        const dateFinMandatSenateur = senateurItem.item.mandats_senateur[0]
-            ?.date_fin
-            ? new Date(senateurItem.item.mandats_senateur[0]?.date_fin)
-            : null;
-        if (dateFinMandatSenateur && dateFinMandatSenateur < dateDebutLegislature) {
-            continue;
-        }
         yield senateurItem;
     }
 }

package/lib/model/agenda.js

@@ -1,6 +1,7 @@
 import { JSDOM } from "jsdom";
 import { DateTime } from "luxon";
 import path from "path";
+import { ID_DATE_FORMAT, STANDARD_DATE_FORMAT } from "../scripts/datautil";
 const FR_TZ = "Europe/Paris";
 function getEventType(eventClasses) {
     const typeClass = [...eventClasses]
@@ -67,7 +68,7 @@ function transformAgenda(document, fileName) {
             continue;
         }
         const type = getEventType(eventElement.classList);
-        const date = DateTime.fromFormat(fileName, "yyyyMMdd").toFormat("yyyy-MM-dd");
+        const date = DateTime.fromFormat(fileName, ID_DATE_FORMAT).toFormat(STANDARD_DATE_FORMAT);
         const timeOriginal = eventElement.querySelector(".time")?.textContent || null;
         const { startTime, endTime } = getStartAndEndTimes(timeOriginal);
         const titre = eventElement.querySelector(".titre")?.textContent?.trim() || null;

package/lib/model/ameli.d.ts

@@ -1,8 +1,8 @@
 import { InferResult } from "kysely";
+export type AmendementResult = InferResult<typeof findAllQuery>[0];
 declare const findAllQuery: import("kysely").SelectQueryBuilder<{
-    sub: import("kysely").Nullable<import("../raw_types/ameli").Sub>;
-    amdsen: import("../raw_types/ameli").Amdsen;
     amd: import("../raw_types/ameli").Amd;
+    amdsen: import("../raw_types/ameli").Amdsen;
     avicom: import("kysely").Nullable<import("../raw_types/ameli").Avicom>;
     avigvt: import("kysely").Nullable<import("../raw_types/ameli").Avigvt>;
     cab: import("kysely").Nullable<import("../raw_types/ameli").Cab>;
@@ -24,12 +24,13 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     sen_ameli: import("../raw_types/ameli").SenAmeli;
     ses: import("kysely").Nullable<import("../raw_types/ameli").Ses>;
     sor: import("kysely").Nullable<import("../raw_types/ameli").Sor>;
+    sub: import("kysely").Nullable<import("../raw_types/ameli").Sub>;
     txt_ameli: import("kysely").Nullable<import("../raw_types/ameli").TxtAmeli>;
     typrect: import("../raw_types/ameli").Typrect;
     typses: import("../raw_types/ameli").Typses;
     typsub: import("kysely").Nullable<import("../raw_types/ameli").Typsub>;
     w_nivrec: import("../raw_types/ameli").WNivrec;
-}, "sub" | "amd" | "avicom" | "avigvt" | "cab" | "com_ameli" | "grppol_ameli" | "irr" | "lec_ameli" | "nat" | "ses" | "sor" | "txt_ameli" | "typsub", {
+}, "amd" | "avicom" | "avigvt" | "cab" | "com_ameli" | "grppol_ameli" | "irr" | "lec_ameli" | "nat" | "ses" | "sor" | "sub" | "txt_ameli" | "typsub", {
     session: string | null;
     signet_dossier_legislatif: string | null;
     nature_texte: string | null;
@@ -58,14 +59,12 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     au_nom_de_groupe_politique: string | null;
     au_nom_de_commission: string | null;
     auteur_est_gouvernement: boolean;
-} & {
     auteurs: {
         prenom: string | null;
         nom: string | null;
         matricule: string | null;
     }[];
 }>;
-export type AmendementResult = InferResult<typeof findAllQuery>[0];
 export declare function findAll(): AsyncIterableIterator<{
     session: string | null;
     signet_dossier_legislatif: string | null;
@@ -95,7 +94,6 @@ export declare function findAll(): AsyncIterableIterator<{
     au_nom_de_groupe_politique: string | null;
     au_nom_de_commission: string | null;
     auteur_est_gouvernement: boolean;
-} & {
     auteurs: {
         prenom: string | null;
         nom: string | null;

package/lib/model/ameli.js

@@ -87,8 +87,8 @@ const findAllQuery = dbAmeli
         .else(false)
         .end()
         .as("auteur_est_gouvernement"),
-])
-    .select(({ ref }) => [auteurs(ref("amd.id")).as("auteurs")]);
+    auteurs(ref("amd.id")).as("auteurs"),
+]);
 export function findAll() {
     return findAllQuery.stream();
 }

package/lib/model/compte_rendu.d.ts

@@ -0,0 +1,3 @@
+import { CompteRendu } from "../types/compte_rendu";
+import { DebatResult } from "./debats";
+export declare function parseCompteRenduFromFile(htmlFilePath: string, debat: DebatResult): Promise<CompteRendu | null>;

package/lib/model/compte_rendu.js

@@ -0,0 +1,32 @@
+import { JSDOM } from "jsdom";
+function transformCompteRendu(document, debat) {
+    const compteRendu = {
+        sections: [],
+    };
+    for (const section of debat.sections) {
+        const compteRenduSection = {
+            id: section.id,
+            interventions: [],
+        };
+        compteRendu.sections.push(compteRenduSection);
+        for (const sectionIntervention of section.interventions) {
+            const interventionAnchor = document.querySelector(`a[name="int${sectionIntervention.id}"]`);
+            const interventionParent = interventionAnchor?.parentElement;
+            compteRenduSection.interventions.push({
+                id: sectionIntervention.id,
+                texteHtml: interventionParent?.outerHTML || null,
+            });
+        }
+    }
+    return compteRendu;
+}
+export async function parseCompteRenduFromFile(htmlFilePath, debat) {
+    try {
+        const { document } = (await JSDOM.fromFile(htmlFilePath, { contentType: "text/html" })).window;
+        return transformCompteRendu(document, debat);
+    }
+    catch (error) {
+        console.error(`Could not parse compte-rendu with error ${error}`);
+    }
+    return null;
+}

package/lib/model/debats.d.ts

@@ -0,0 +1,81 @@
+import { InferResult } from "kysely";
+export type DebatResult = InferResult<typeof findAllQuery>[0];
+declare const findAllQuery: import("kysely").SelectQueryBuilder<import("../raw_types/debats").DB, "debats", {
+    id: string;
+    date_seance: string;
+    numero: string | null;
+    url: string | null;
+    etat_synchronisation: string | null;
+    sections: {
+        id: string | null;
+        numero: string | null;
+        objet: string | null;
+        url: string | null;
+        type: string | null;
+        categorie: string | null;
+        interventions: {
+            id: string | null;
+            auteur_code: string;
+            fonction_intervenant: string | null;
+            url: string | null;
+            analyse: string | null;
+        }[];
+        lecture_id: string;
+    }[];
+    sections_divers: {
+        type: string | null;
+        categorie: string | null;
+        libelle: string | null;
+        objet: string | null;
+        interventions: {
+            id: string | null;
+            auteur_code: string;
+            fonction_intervenant: string | null;
+            url: string | null;
+            analyse: string | null;
+        }[];
+    }[];
+    lectures: {
+        id: string;
+    }[];
+}>;
+export declare function findAll(): AsyncIterableIterator<{
+    id: string;
+    date_seance: string;
+    numero: string | null;
+    url: string | null;
+    etat_synchronisation: string | null;
+    sections: {
+        id: string | null;
+        numero: string | null;
+        objet: string | null;
+        url: string | null;
+        type: string | null;
+        categorie: string | null;
+        interventions: {
+            id: string | null;
+            auteur_code: string;
+            fonction_intervenant: string | null;
+            url: string | null;
+            analyse: string | null;
+        }[];
+        lecture_id: string;
+    }[];
+    sections_divers: {
+        type: string | null;
+        categorie: string | null;
+        libelle: string | null;
+        objet: string | null;
+        interventions: {
+            id: string | null;
+            auteur_code: string;
+            fonction_intervenant: string | null;
+            url: string | null;
+            analyse: string | null;
+        }[];
+    }[];
+    lectures: {
+        id: string;
+    }[];
+}>;
+export {};

package/lib/model/debats.js

@@ -1 +1,81 @@
-"use strict";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { dbDebats } from "../databases";
+import { ID_DATE_FORMAT } from "../scripts/datautil";
+import { toDateString } from "./util";
+function sectionsLegislatives(dateSeance) {
+    return jsonArrayFrom(dbDebats
+        .selectFrom("secdis")
+        .leftJoin("typsec", "secdis.typseccod", "typsec.typseccod")
+        .where("secdis.datsea", "=", dateSeance)
+        .select(({ ref }) => [
+        "secdis.secdisordid as id",
+        "secdis.secdisnum as numero",
+        "secdis.secdisobj as objet",
+        "secdis.secdisurl as url",
+        "typsec.typseclib as type",
+        "typsec.typseccat as categorie",
+        interventionsLegislatives(ref("secdis.secdiscle")).as("interventions"),
+        "secdis.lecassidt as lecture_id"
+    ])
+        .orderBy("secdis.secdisordid asc"));
+}
+function interventionsLegislatives(sectionId) {
+    return jsonArrayFrom(dbDebats
+        .selectFrom("intpjl")
+        .where("intpjl.secdiscle", "=", sectionId)
+        .select(({ ref, val }) => [
+        "intpjl.intordid as id",
+        "intpjl.autcod as auteur_code",
+        "intpjl.intfon as fonction_intervenant",
+        "intpjl.inturl as url",
+        "intpjl.intana as analyse",
+    ])
+        .orderBy("intpjl.intordid asc"));
+}
+function sectionsNonLegislatives(dateSeance) {
+    return jsonArrayFrom(dbDebats
+        .selectFrom("secdivers")
+        .leftJoin("typsec", "secdivers.typseccod", "typsec.typseccod")
+        .where("secdivers.datsea", "=", dateSeance)
+        .select(({ ref }) => [
+        "secdivers.secdiverslibelle as libelle",
+        "secdivers.secdiversobj as objet",
+        "typsec.typseclib as type",
+        "typsec.typseccat as categorie",
+        interventionsNonLegislatives(ref("secdivers.secdiverscle")).as("interventions"),
+    ]));
+}
+function interventionsNonLegislatives(sectionId) {
+    return jsonArrayFrom(dbDebats
+        .selectFrom("intdivers")
+        .where("intdivers.intdiverscle", "=", sectionId)
+        .select(({ ref, val }) => [
+        "intdivers.intdiversordid as id",
+        "intdivers.autcod as auteur_code",
+        "intdivers.intfon as fonction_intervenant",
+        "intdivers.inturl as url",
+        "intdivers.intana as analyse",
+    ])
+        .orderBy("intdivers.intdiversordid asc"));
+}
+function lecturesAssemblee(dateSeance) {
+    return jsonArrayFrom(dbDebats
+        .selectFrom("lecassdeb")
+        .where("lecassdeb.datsea", "=", dateSeance)
+        .select("lecassdeb.lecassidt as id"));
+}
+const findAllQuery = dbDebats
+    .selectFrom("debats")
+    .select(({ ref, val }) => [
+    toDateString(ref("debats.datsea"), val(ID_DATE_FORMAT)).as("id"),
+    toDateString(ref("debats.datsea")).as("date_seance"),
+    "debats.numero as numero",
+    "debats.deburl as url",
+    "debats.debsyn as etat_synchronisation",
+    sectionsLegislatives(ref("debats.datsea")).as("sections"),
+    sectionsNonLegislatives(ref("debats.datsea")).as("sections_divers"),
+    lecturesAssemblee(ref("debats.datsea")).as("lectures"),
+]);
+export function findAll() {
+    return findAllQuery.stream();
+}

package/lib/model/dosleg.d.ts

@@ -1,9 +1,11 @@
 import { InferResult } from "kysely";
+export type DossierLegislatifResult = InferResult<typeof findAllQuery>[0];
+export type AuteurResult = InferResult<typeof findAuteursQuery>[0];
 declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     ses: import("../raw_types/dosleg").Ses;
     qua: import("../raw_types/dosleg").Qua;
     lecture: import("../raw_types/dosleg").Lecture;
-    date_seance: import("../raw_types/dosleg").DateSeance;
+    loi: import("../raw_types/dosleg").Loi;
     amescr: import("../raw_types/dosleg").Amescr;
     ass: import("../raw_types/dosleg").Ass;
     aud: import("../raw_types/dosleg").Aud;
@@ -13,6 +15,7 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     catrap: import("../raw_types/dosleg").Catrap;
     com: import("../raw_types/dosleg").Com;
     corscr: import("../raw_types/dosleg").Corscr;
+    date_seance: import("../raw_types/dosleg").DateSeance;
     deccoc: import("../raw_types/dosleg").Deccoc;
     delega: import("../raw_types/dosleg").Delega;
     denrap: import("../raw_types/dosleg").Denrap;
@@ -44,7 +47,6 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     libdelega: import("../raw_types/dosleg").Libdelega;
     libgrppol: import("../raw_types/dosleg").Libgrppol;
     lnkrap: import("../raw_types/dosleg").Lnkrap;
-    loi: import("../raw_types/dosleg").Loi;
     loithe: import("../raw_types/dosleg").Loithe;
     memcom: import("../raw_types/dosleg").Memcom;
     memdelega: import("../raw_types/dosleg").Memdelega;
@@ -82,7 +84,7 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     typtxt: import("../raw_types/dosleg").Typtxt;
     typurl: import("../raw_types/dosleg").Typurl;
     votsen: import("../raw_types/dosleg").Votsen;
-}, "etaloi" | "loi" | "typloi", {
+}, "loi" | "etaloi" | "typloi", {
     url: string;
     signet: string;
     titre: string;
@@ -107,30 +109,30 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
             session: string | null;
             textes: {
                 url: string;
-                date: string;
+                numero: string | null;
                 id: string | null;
+                origine: string;
                 type: string;
+                date: string;
                 session: string | null;
                 auteurs: {
                     prenom: string | null;
                     nom_usuel: string;
                     matricule: string | null;
                 }[];
-                numero: string | null;
-                origine: string;
             }[];
             rapports: {
                 url: string;
-                date: string;
-                numero: string | null;
                 id: string | null;
                 type: string;
+                date: string;
                 session: string;
                 auteurs: {
                     prenom: string | null;
                     nom_usuel: string;
                     matricule: string | null;
                 }[];
+                numero: string | null;
             }[];
             dates_seances: {
                 date: string;
@@ -173,30 +175,30 @@ export declare function findAll(): AsyncIterableIterator<{
             session: string | null;
             textes: {
                 url: string;
-                date: string;
+                numero: string | null;
                 id: string | null;
+                origine: string;
                 type: string;
+                date: string;
                 session: string | null;
                 auteurs: {
                     prenom: string | null;
                     nom_usuel: string;
                     matricule: string | null;
                 }[];
-                numero: string | null;
-                origine: string;
             }[];
             rapports: {
                 url: string;
-                date: string;
-                numero: string | null;
                 id: string | null;
                 type: string;
+                date: string;
                 session: string;
                 auteurs: {
                     prenom: string | null;
                     nom_usuel: string;
                     matricule: string | null;
                 }[];
+                numero: string | null;
             }[];
             dates_seances: {
                 date: string;
@@ -223,5 +225,16 @@ export declare function findSenatRapportUrls(sessions?: number[]): AsyncIterable
     url: string;
     session: string | null | undefined;
 }>;
-export type DossierLegislatifResult = InferResult<typeof findAllQuery>[0];
+declare const findAuteursQuery: import("kysely").SelectQueryBuilder<import("../raw_types/dosleg").DB, "auteur", {
+    code: string;
+    nom: string;
+    prenom: string | null;
+    matricule: string | null;
+}>;
+export declare function findAuteur(auteurCode: string): Promise<{
+    code: string;
+    nom: string;
+    prenom: string | null;
+    matricule: string | null;
+} | undefined>;
 export {};

package/lib/model/dosleg.js

@@ -131,7 +131,9 @@ function themes(loiId) {
         .selectFrom("the")
         .leftJoin("loithe", "loithe.thecle", "the.thecle")
         .where("loithe.loicod", "=", loiId)
-        .select(["the.thelib as libelle"]));
+        .select([
+        "the.thelib as libelle",
+    ]));
 }
 const findAllQuery = dbDosleg
     .selectFrom("loi")
@@ -198,7 +200,23 @@ export function findSenatRapportUrls(sessions = []) {
         .where("rapurl", "is not", null)
         .where("typurl", "=", "I")
         .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessionsStr))
-        .select(({ ref }) => [rtrim(ref("rapurl")).as("url"), "sesann as session"])
+        .select(({ ref }) => [
+        "sesann as session",
+        rtrim(ref("rapurl")).as("url"),
+    ])
         .$narrowType()
         .stream();
 }
+const findAuteursQuery = dbDosleg
+    .selectFrom("auteur")
+    .select([
+    "autcod as code",
+    "nomuse as nom",
+    "prenom as prenom",
+    "autmat as matricule",
+]);
+export async function findAuteur(auteurCode) {
+    return findAuteursQuery
+        .where("autcod", "=", auteurCode)
+        .executeTakeFirst();
+}

package/lib/model/index.d.ts

@@ -1,4 +1,5 @@
 export { findAll as findAllAmendements } from "./ameli";
-export { findAll as findAllLois } from "./dosleg";
+export { findAll as findAllDebats } from "./debats";
+export { findAll as findAllLois, findAuteur, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";

package/lib/model/index.js

@@ -1,4 +1,5 @@
 export { findAll as findAllAmendements } from "./ameli";
-export { findAll as findAllLois } from "./dosleg";
+export { findAll as findAllDebats } from "./debats";
+export { findAll as findAllLois, findAuteur, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";