@tricoteuses/senat 2.22.5 → 2.22.6

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

@@ -11,6 +11,8 @@ declare const findAllAmendementsQuery: import("kysely").SelectQueryBuilder<{
     etat: string;
     sort: any;
     url: string;
+    au_nom_de_commission: string;
+    code_commission: string;
     auteur_est_gouvernement: boolean;
     scrutin_num: any;
     auteurs: {
@@ -33,6 +35,8 @@ export declare function findAllAmendements(fromSession?: number): AsyncIterableI
     etat: string;
     sort: any;
     url: string;
+    au_nom_de_commission: string;
+    code_commission: string;
     auteur_est_gouvernement: boolean;
     scrutin_num: any;
     auteurs: {

package/lib/src/model/ameli.js

@@ -1,7 +1,7 @@
 import { sql } from "kysely";
 import { jsonArrayFrom } from "kysely/helpers/postgres";
 import { dbSenat } from "../databases";
-import { concat, toDateString } from "./util";
+import { concat, rtrim, toDateString } from "./util";
 function auteurs(amendementId) {
     return jsonArrayFrom(dbSenat
         .selectFrom("ameli.amdsen")
@@ -134,8 +134,8 @@ const findAllAmendementsQuery = dbSenat
         .else(val("https://www.senat.fr/amendements/"))
         .end(), ref("ameli.ses.ann"), val("-"), sql `(ameli.ses.ann + 1)`, val("/"), ref("ameli.txt_ameli.numabs"), val("/Amdt_"), ref("ameli.amd.num"), val(".html")).as("url"),
     "ameli.grppol_ameli.lilcou as au_nom_de_groupe_politique",
-    "ameli.com_ameli.lil as au_nom_de_commission",
-    "ameli.com_ameli.cod as code_commission",
+    rtrim(ref("ameli.com_ameli.lil")).as("au_nom_de_commission"),
+    rtrim(ref("ameli.com_ameli.cod")).as("code_commission"),
     eb.case().when("ameli.cab.entid", "is not", null).then(true).else(false).end().as("auteur_est_gouvernement"),
     scrutin(ref("ameli.amd.num"), ref("ameli.ses.ann"), ref("dosleg.texte.lecassidt")),
     auteurs(ref("ameli.amd.id")).as("auteurs"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.22.5",
+  "version": "2.22.6",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",

package/lib/aggregates.d.ts

@@ -1,52 +0,0 @@
-import { Ses, Sub, TxtAmeli } from "./types/ameli";
-import { Debat } from "./types/debats";
-import { Ass, Aud, Auteur, DateSeance, DecCoc, DenRap, DocAtt, Ecr, EtaLoi, LecAss, LecAssRap, Lecture, Loi, Org, OriTxt, Qua, Rap, Scr, Texte, TypAtt, TypLec, TypLoi, TypTxt, TypUrl } from "./types/dosleg";
-import { Question } from "./types/questions";
-export declare const allFollows: string[];
-export declare class Aggregator {
-    follow: Set<string>;
-    objectByIdByTableName: {
-        [name: string]: {
-            [id: string]: object;
-        };
-    };
-    requestedIdsByTableName: {
-        [name: string]: Set<string>;
-    };
-    visitedIdsByTableName: {
-        [name: string]: Set<string>;
-    };
-    constructor(follow: Set<string>);
-    addAss(ass: Ass): void;
-    addAud(aud: Aud): void;
-    addAuteur(auteur: Auteur): void;
-    addDateSeance(dateSeance: DateSeance): void;
-    addDebat(debat: Debat): void;
-    addDeccoc(deccoc: DecCoc): void;
-    addDenrap(denrap: DenRap): void;
-    addDocatt(docatt: DocAtt): void;
-    addEcr(ecr: Ecr): void;
-    addEtaloi(etaloi: EtaLoi): void;
-    addLecass(lecass: LecAss): void;
-    addLecassrap(lecassrap: LecAssRap): void;
-    addLecture(lecture: Lecture): void;
-    addLoi(loi: Loi): void;
-    addOrg(org: Org): void;
-    addOritxt(oritxt: OriTxt): void;
-    addQua(qua: Qua): void;
-    addQuestion(question: Question): void;
-    addRap(rap: Rap): void;
-    addScr(scr: Scr): void;
-    addSes(ses: Ses): void;
-    addSub(sub: Sub): void;
-    addTexte(texte: Texte): void;
-    addTxtAmeli(txtAmeli: TxtAmeli): void;
-    addTypatt(typatt: TypAtt): void;
-    addTyplec(typlec: TypLec): void;
-    addTyploi(typloi: TypLoi): void;
-    addTyptxt(typtxt: TypTxt): void;
-    addTypurl(typurl: TypUrl): void;
-    getAll(): Promise<void>;
-    request(tableName: string, id: string): void;
-    toJson(): any;
-}