@tricoteuses/senat 2.10.4 → 2.11.0

package/lib/databases.d.ts

@@ -1,29 +1,2 @@
 import { Kysely } from "kysely";
-import { TableTypes as AmeliTableTypes } from "./raw_types/ameli";
-import { TableTypes as DebatsTableTypes } from "./raw_types/debats";
-import { TableTypes as DoslegTableTypes } from "./raw_types/dosleg";
-import { TableTypes as QuestionsTableTypes } from "./raw_types/questions";
-import { TableTypes as SensTableTypes } from "./raw_types/sens";
-type AmeliDb = {
-    [K in keyof AmeliTableTypes]: AmeliTableTypes[K]["select"];
-};
-type DebatsDb = {
-    [K in keyof DebatsTableTypes]: DebatsTableTypes[K]["select"];
-};
-type DoslegDb = {
-    [K in keyof DoslegTableTypes]: DoslegTableTypes[K]["select"];
-};
-type QuestionsDb = {
-    [K in keyof QuestionsTableTypes]: QuestionsTableTypes[K]["select"];
-};
-type SensDb = {
-    [K in keyof SensTableTypes]: SensTableTypes[K]["select"];
-};
-export type SenatDb = AmeliDb & DebatsDb & DoslegDb & QuestionsDb & SensDb;
-export declare const dbSenat: Kysely<SenatDb>;
-export declare const dbAmeli: Kysely<AmeliDb>;
-export declare const dbDebats: Kysely<DebatsDb>;
-export declare const dbDosleg: Kysely<DoslegDb>;
-export declare const dbQuestions: Kysely<QuestionsDb>;
-export declare const dbSens: Kysely<SensDb>;
-export {};
+export declare const dbSenat: Kysely<any>;

package/lib/databases.js

@@ -3,7 +3,6 @@ import * as pg from "pg";
 import { types } from "pg";
 import Cursor from "pg-cursor";
 import config from "./config";
-import { datasets } from "./datasets";
 // Map int8 to number instead of string
 // https://github.com/brianc/node-pg-types#use
 pg.types.setTypeParser(types.builtins.INT8, (val) => {
@@ -25,8 +24,3 @@ export const dbSenat = new Kysely({
     log: ["error"],
     dialect: senatDialect,
 });
-export const dbAmeli = dbSenat.withSchema(datasets.ameli.database);
-export const dbDebats = dbSenat.withSchema(datasets.debats.database);
-export const dbDosleg = dbSenat.withSchema(datasets.dosleg.database);
-export const dbQuestions = dbSenat.withSchema(datasets.questions.database);
-export const dbSens = dbSenat.withSchema(datasets.sens.database);

package/lib/datasets.d.ts

@@ -4,6 +4,12 @@ export interface Dataset {
     repairZip?: (dataset: Dataset, dataDir: string) => void;
     title: string;
     url: string;
+    indexes?: {
+        [table: string]: Array<{
+            name: string;
+            columns: string[];
+        }>;
+    };
 }
 export interface Datasets {
     ameli: Dataset;

package/lib/datasets.js

@@ -25,24 +25,231 @@ export const datasets = {
         },
         title: "Amendements",
         url: "https://data.senat.fr/data/ameli/ameli.zip",
+        indexes: {
+            amdsen: [
+                { name: "idx_amdid", columns: ["amdid"] },
+                { name: "idx_senid", columns: ["senid"] },
+                { name: "idx_grpid", columns: ["grpid"] },
+            ],
+            sen_ameli: [
+                { name: "idx_entid", columns: ["entid"] },
+            ],
+            grppol_ameli: [
+                { name: "idx_entid", columns: ["entid"] },
+            ],
+            sub: [
+                { name: "idx_id", columns: ["id"] },
+                { name: "idx_typid", columns: ["typid"] },
+                { name: "idx_merid", columns: ["merid"] },
+                { name: "idx_comdelid", columns: ["comdelid"] },
+            ],
+            typsub: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            typrect: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            txt_ameli: [
+                { name: "idx_id", columns: ["id"] },
+                { name: "idx_txtetaid", columns: ["txtetaid"] },
+                { name: "idx_sesdepid", columns: ["sesdepid"] },
+                { name: "idx_natid", columns: ["natid"] },
+                { name: "idx_lecid", columns: ["lecid"] },
+            ],
+            etatxt: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            ses: [
+                { name: "idx_id", columns: ["id"] },
+                { name: "idx_typid", columns: ["typid"] },
+                { name: "idx_ann", columns: ["ann"] }
+            ],
+            typses: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            nat: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            lec_ameli: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            mot: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            avicom: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            avigvt: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            sor: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            irr: [
+                { name: "idx_id", columns: ["id"] },
+            ],
+            com_ameli: [
+                { name: "idx_entid", columns: ["entid"] },
+            ],
+            cab: [
+                { name: "idx_entid", columns: ["entid"] },
+            ],
+            amd: [
+                { name: "idx_subid", columns: ["subid"] },
+                { name: "idx_typrectid", columns: ["typrectid"] },
+                { name: "idx_txtid", columns: ["txtid"] },
+                { name: "idx_motid", columns: ["motid"] },
+                { name: "idx_avcid", columns: ["avcid"] },
+                { name: "idx_avgid", columns: ["avgid"] },
+                { name: "idx_sorid", columns: ["sorid"] },
+                { name: "idx_irrid", columns: ["irrid"] },
+                { name: "idx_nomentid", columns: ["nomentid"] },
+            ],
+        },
     },
     debats: {
         database: "debats",
         repairEncoding: true,
         title: "Informations relatives aux comptes rendus intégraux de la séance publique",
         url: "https://data.senat.fr/data/debats/debats.zip",
+        indexes: {
+            secdis: [
+                { name: "idx_datsea", columns: ["datsea"] },
+                { name: "idx_typseccod", columns: ["typseccod"] },
+            ],
+            intpjl: [
+                { name: "idx_secdiscle", columns: ["secdiscle"] },
+            ],
+            secdivers: [
+                { name: "idx_datsea", columns: ["datsea"] },
+                { name: "idx_typseccod", columns: ["typseccod"] },
+            ],
+            intdivers: [
+                { name: "idx_intdiverscle", columns: ["intdiverscle"] },
+            ],
+            lecassdeb: [
+                { name: "idx_datsea", columns: ["datsea"] },
+            ],
+        },
     },
     dosleg: {
         database: "dosleg",
         repairEncoding: true,
         title: "Dossiers législatifs",
         url: "https://data.senat.fr/data/dosleg/dosleg.zip",
+        indexes: {
+            amescr: [
+                { name: "idx_scrnum", columns: ["scrnum"] },
+            ],
+            auteur: [
+                { name: "idx_autcod", columns: ["autcod"] },
+            ],
+            corscr: [
+                { name: "idx_scrnum", columns: ["scrnum"] },
+            ],
+            date_seance: [
+                { name: "idx_code", columns: ["code"] },
+                { name: "idx_lecidt", columns: ["lecidt"] },
+            ],
+            deccoc: [
+                { name: "idx_deccoccod", columns: ["deccoccod"] },
+            ],
+            etaloi: [
+                { name: "idx_etaloicod", columns: ["etaloicod"] },
+            ],
+            lecass: [
+                { name: "idx_lecidt", columns: ["lecidt"] },
+                { name: "idx_codass", columns: ["codass"] },
+                { name: "idx_orgcod", columns: ["orgcod"] },
+                { name: "idx_orippr", columns: ["orippr"] },
+            ],
+            lecassrap: [
+                { name: "idx_rapcod", columns: ["rapcod"] },
+                { name: "idx_lecassidt", columns: ["lecassidt"] },
+            ],
+            lecture: [
+                { name: "idx_loicod", columns: ["loicod"] },
+                { name: "idx_typleccod", columns: ["typleccod"] },
+                { name: "idx_lecidt", columns: ["lecidt"] },
+            ],
+            loi: [
+                { name: "idx_typloicod", columns: ["typloicod"] },
+                { name: "idx_etaloicod", columns: ["etaloicod"] },
+                { name: "idx_deccoccod", columns: ["deccoccod"] },
+                { name: "idx_loicod", columns: ["loicod"] },
+            ],
+            loithe: [
+                { name: "idx_thecle", columns: ["thecle"] },
+                { name: "idx_loicod", columns: ["loicod"] },
+            ],
+            posvot: [
+                { name: "idx_posvotcod", columns: ["posvotcod"] },
+            ],
+            rap: [
+                { name: "idx_rapcod", columns: ["rapcod"] },
+                { name: "idx_coddenrap", columns: ["coddenrap"] },
+            ],
+            rolsig: [
+                { name: "idx_signataire", columns: ["signataire"] },
+            ],
+            scr: [
+                { name: "idx_code", columns: ["code"] },
+                { name: "idx_scrnum", columns: ["scrnum"] },
+                { name: "idx_sesann", columns: ["sesann"] },
+            ],
+            stavot: [
+                { name: "idx_stavotidt", columns: ["stavotidt"] },
+            ],
+            texte: [
+                { name: "idx_lecassidt", columns: ["lecassidt"] },
+                { name: "idx_oritxtcod", columns: ["oritxtcod"] },
+                { name: "idx_typtxtcod", columns: ["typtxtcod"] },
+                { name: "idx_texcod", columns: ["texcod"] },
+            ],
+            the: [
+                { name: "idx_thecle", columns: ["thecle"] },
+            ],
+            titsen: [
+                { name: "idx_titsencod", columns: ["titsencod"] },
+            ],
+            typloi: [
+                { name: "idx_typloicod", columns: ["typloicod"] },
+            ],
+            typtxt: [
+                { name: "idx_typtxtcod", columns: ["typtxtcod"] },
+            ],
+            votsen: [
+                { name: "idx_scrnum", columns: ["scrnum"] },
+                { name: "idx_titsencod", columns: ["titsencod"] },
+                { name: "idx_stavotidt", columns: ["stavotidt"] },
+                { name: "idx_posvotcod", columns: ["posvotcod"] },
+                { name: "idx_senmat", columns: ["senmat"] },
+            ],
+        },
     },
     questions: {
         database: "questions",
         repairEncoding: true,
         title: "Questions écrites et orales posées par les sénateurs au Gouvernement",
         url: "https://data.senat.fr/data/questions/questions.zip",
+        indexes: {
+            tam_reponses: [
+                { name: "idx_idque", columns: ["idque"] },
+            ],
+            tam_questions: [
+                { name: "idx_sorquecod", columns: ["sorquecod"] },
+                { name: "idx_etaquecod", columns: ["etaquecod"] },
+            ],
+            the: [
+                { name: "idx_thenouidt", columns: ["thenouidt"] },
+            ],
+            sortquestion: [
+                { name: "idx_sorquecod", columns: ["sorquecod"] },
+            ],
+            etatquestion: [
+                { name: "idx_etaquecod", columns: ["etaquecod"] },
+            ],
+        },
     },
     sens: {
         database: "sens",
@@ -55,6 +262,32 @@ export const datasets = {
         },
         title: "Sénateurs (y compris organes et présence)",
         url: "https://data.senat.fr/data/senateurs/export_sens.zip",
+        indexes: {
+            dpt: [
+                { name: "idx_dptnum", columns: ["dptnum"] },
+                { name: "idx_regcod", columns: ["regcod"] },
+            ],
+            activite_loi: [
+                { name: "idx_actid", columns: ["actid"] },
+            ],
+            activite_delegation: [
+                { name: "idx_actid", columns: ["actid"] },
+            ],
+            activite_participant: [
+                { name: "idx_senmat", columns: ["senmat"] },
+            ],
+            activite_senateur: [
+                { name: "idx_senmat", columns: ["senmat"] },
+            ],
+            senbur: [
+                { name: "idx_senmat", columns: ["senmat"] },
+                { name: "idx_burcod", columns: ["burcod"] },
+            ],
+            elucan: [
+                { name: "idx_senmat", columns: ["senmat"] },
+                { name: "idx_typmancod", columns: ["typmancod"] },
+            ],
+        },
     },
 };
 export function getEnabledDatasets(categories) {

package/lib/index.d.ts

@@ -2,7 +2,7 @@ export type { AmendementResult, } from "./model/ameli";
 export type { DossierLegislatifResult, } from "./model/dosleg";
 export type { QuestionResult, } from "./model/questions";
 export type { CirconscriptionResult, OrganismeResult, SenateurResult, } from "./model/sens";
-export type { AgendaEvent } from "./types/agenda";
+export type { AgendaEvent, GroupedReunion } 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";

package/lib/model/ameli.d.ts

@@ -1,161 +1,49 @@
 import { InferResult } from "kysely";
-export type AmendementResult = InferResult<typeof findAllQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<{
-    amd: import("../raw_types/ameli").Amd;
-    mot: import("kysely").Nullable<import("../raw_types/ameli").Mot>;
-    sub: import("kysely").Nullable<import("../raw_types/ameli").Sub>;
-    ent: import("../raw_types/ameli").Ent;
-    sor: import("kysely").Nullable<import("../raw_types/ameli").Sor>;
-    avicom: import("kysely").Nullable<import("../raw_types/ameli").Avicom>;
-    avigvt: import("kysely").Nullable<import("../raw_types/ameli").Avigvt>;
-    irr: import("kysely").Nullable<import("../raw_types/ameli").Irr>;
-    txt_ameli: import("kysely").Nullable<import("../raw_types/ameli").TxtAmeli>;
-    typrect: import("kysely").Nullable<import("../raw_types/ameli").Typrect>;
-    amdsen: import("../raw_types/ameli").Amdsen;
-    sen_ameli: import("../raw_types/ameli").SenAmeli;
-    grppol_ameli: import("kysely").Nullable<import("../raw_types/ameli").GrppolAmeli>;
-    cab: import("kysely").Nullable<import("../raw_types/ameli").Cab>;
-    com_ameli: import("kysely").Nullable<import("../raw_types/ameli").ComAmeli>;
-    etatxt: import("kysely").Nullable<import("../raw_types/ameli").Etatxt>;
-    fbu: import("../raw_types/ameli").Fbu;
-    ses: import("kysely").Nullable<import("../raw_types/ameli").Ses>;
-    gvt: import("../raw_types/ameli").Gvt;
-    intora: import("../raw_types/ameli").Intora;
-    sea: import("../raw_types/ameli").Sea;
-    orarol: import("../raw_types/ameli").Orarol;
-    lec_ameli: import("kysely").Nullable<import("../raw_types/ameli").LecAmeli>;
-    nat: import("kysely").Nullable<import("../raw_types/ameli").Nat>;
-    sai: import("../raw_types/ameli").Sai;
-    saisen: import("../raw_types/ameli").Saisen;
-    typses: import("kysely").Nullable<import("../raw_types/ameli").Typses>;
-    typsub: import("kysely").Nullable<import("../raw_types/ameli").Typsub>;
-    w_nivrec: import("../raw_types/ameli").WNivrec;
-}, "amd" | "mot" | "sub" | "sor" | "avicom" | "avigvt" | "irr" | "txt_ameli" | "typrect" | "grppol_ameli" | "cab" | "com_ameli" | "etatxt" | "ses" | "lec_ameli" | "nat" | "typses" | "typsub", {
-    session: number | null;
-    session_libelle: string | null;
-    type_session: string | null;
-    signet_dossier_legislatif: string | null;
-    nature_texte: string | null;
-    nature_texte_libelle: string | null;
-    numero_texte: number | null;
-    numero_adoption_texte: number | null;
-    intitule_texte: string | null;
-    etat_texte: string | null;
-    etat_texte_libelle: string | null;
-    type_texte: string | null;
-    lecture: string | null;
+export type AmendementResult = InferResult<typeof findAllAmendementsQuery>[0];
+declare const findAllAmendementsQuery: import("kysely").SelectQueryBuilder<{
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+}, "ameli.amd" | "ameli.sub" | "ameli.typsub" | "ameli.typrect" | "ameli.txt_ameli" | "ameli.etatxt" | "ameli.ses" | "ameli.typses" | "ameli.nat" | "ameli.lec_ameli" | "ameli.mot" | "ameli.avicom" | "ameli.avigvt" | "ameli.sor" | "ameli.irr" | "ameli.grppol_ameli" | "ameli.com_ameli" | "ameli.cab" | "dosleg.amescr", {
+    [x: string]: any;
     nature: string;
-    id: number;
-    parent_id: number | null;
-    rendu_similaire_id: number | null;
-    identique_id: number | null;
-    discussion_commune_id: number | null;
-    numero: string | null;
-    numero_absolu: number | null;
-    ordre: number | null;
-    accepte_gouvernement: string | null;
-    subdivision_libelle: string | null;
-    subdivision_libelle_court: string | null;
-    subdivision_position_texte: number | null;
-    subdivision_position_discussion: number | null;
-    subdivision_mere_id: number | null;
-    subdivision_signet: string | null;
-    subdivision_commission_id: number | null;
-    subdivision_dupliquee: string | null;
-    subdivision_type: string | null;
-    alinea: number | null;
-    commentaire_probleme: string | null;
-    observations: string | null;
-    observations_additionnelles: string | null;
     date_depot: string;
-    dispositif: string | null;
-    objet: string | null;
-    type_rectification: string | null;
-    motion_libelle: string | null;
     etat: string;
-    avis_commission: string | null;
-    avis_gouvernement: string | null;
-    sort: string | null;
-    revision: number;
+    sort: any;
     url: string;
-    au_nom_de_groupe_politique: string | null;
-    au_nom_de_commission: string | null;
     auteur_est_gouvernement: boolean;
     auteurs: {
-        prenom: string | null;
-        homonyme: string | null;
-        nom: string | null;
-        qualite: string | null;
-        rang: number | null;
-        matricule: string | null;
-        groupe_politique_id: number | null;
-        group_politique_code: string | null;
-        groupe_politique_libelle_court: string | null;
-        groupe_politique_libelle: string | null;
+        prenom: any;
+        homonyme: any;
+        nom: any;
+        qualite: any;
+        rang: any;
+        matricule: any;
+        groupe_politique_id: any;
+        group_politique_code: any;
+        groupe_politique_libelle_court: any;
+        groupe_politique_libelle: any;
     }[];
 }>;
-export declare function findAll(): AsyncIterableIterator<{
-    session: number | null;
-    session_libelle: string | null;
-    type_session: string | null;
-    signet_dossier_legislatif: string | null;
-    nature_texte: string | null;
-    nature_texte_libelle: string | null;
-    numero_texte: number | null;
-    numero_adoption_texte: number | null;
-    intitule_texte: string | null;
-    etat_texte: string | null;
-    etat_texte_libelle: string | null;
-    type_texte: string | null;
-    lecture: string | null;
+export declare function findAllAmendements(fromSession?: number): AsyncIterableIterator<{
+    [x: string]: any;
     nature: string;
-    id: number;
-    parent_id: number | null;
-    rendu_similaire_id: number | null;
-    identique_id: number | null;
-    discussion_commune_id: number | null;
-    numero: string | null;
-    numero_absolu: number | null;
-    ordre: number | null;
-    accepte_gouvernement: string | null;
-    subdivision_libelle: string | null;
-    subdivision_libelle_court: string | null;
-    subdivision_position_texte: number | null;
-    subdivision_position_discussion: number | null;
-    subdivision_mere_id: number | null;
-    subdivision_signet: string | null;
-    subdivision_commission_id: number | null;
-    subdivision_dupliquee: string | null;
-    subdivision_type: string | null;
-    alinea: number | null;
-    commentaire_probleme: string | null;
-    observations: string | null;
-    observations_additionnelles: string | null;
     date_depot: string;
-    dispositif: string | null;
-    objet: string | null;
-    type_rectification: string | null;
-    motion_libelle: string | null;
     etat: string;
-    avis_commission: string | null;
-    avis_gouvernement: string | null;
-    sort: string | null;
-    revision: number;
+    sort: any;
     url: string;
-    au_nom_de_groupe_politique: string | null;
-    au_nom_de_commission: string | null;
     auteur_est_gouvernement: boolean;
     auteurs: {
-        prenom: string | null;
-        homonyme: string | null;
-        nom: string | null;
-        qualite: string | null;
-        rang: number | null;
-        matricule: string | null;
-        groupe_politique_id: number | null;
-        group_politique_code: string | null;
-        groupe_politique_libelle_court: string | null;
-        groupe_politique_libelle: string | null;
+        prenom: any;
+        homonyme: any;
+        nom: any;
+        qualite: any;
+        rang: any;
+        matricule: any;
+        groupe_politique_id: any;
+        group_politique_code: any;
+        groupe_politique_libelle_court: any;
+        groupe_politique_libelle: any;
     }[];
 }>;
 export {};