@tricoteuses/senat 2.2.1 → 2.3.1

package/lib/loaders.d.ts

@@ -34,7 +34,7 @@ export interface RapportMetadata {
     url_html: URL;
     url_pdf: URL;
 }
-export interface DossierLegislatifTexteResult {
+export interface DossierLegislatifDocumentResult {
     signet_dossier: string;
     url_dossier_senat: string;
     url_dossier_assemblee_nationale: string | null;
@@ -42,9 +42,10 @@ export interface DossierLegislatifTexteResult {
     libelle_lecture: string;
     libelle_organisme: string | null;
     numero: string | null;
+    id: string | null;
     url: string;
-    origine_texte: string;
-    type_texte: string;
+    origine?: string | null | undefined;
+    type: string;
     date: string;
     session: string | null;
     auteurs: {
@@ -52,13 +53,18 @@ export interface DossierLegislatifTexteResult {
         nom_usuel: string;
         matricule: string | null;
     }[];
+    organismes?: {
+        libelle: string;
+    }[] | undefined;
 }
 export declare function iterFilePaths(dirPath: string): Generator<string>;
 export declare function iterLoadSenatAmendements(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<AmendementResult>>;
 export declare function iterLoadSenatDossiersLegislatifs(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifResult>>;
-export declare function iterLoadSenatDossiersLegislatifsTexteUrls(dataDir: string, session: number | undefined): Generator<IterItem<TexteMetadata>>;
 export declare function iterLoadSenatDossiersLegislatifsRapportUrls(dataDir: string, session: number | undefined): Generator<IterItem<RapportMetadata>>;
-export declare function iterLoadSenatDossiersLegislatifsTextes(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifTexteResult>>;
+export declare function iterLoadSenatDossiersLegislatifsTexteUrls(dataDir: string, session: number | undefined): Generator<IterItem<TexteMetadata>>;
+export declare function iterLoadSenatDossiersLegislatifsDocuments(dataDir: string, session: number | undefined, documentType: "textes" | "rapports", options?: {}): Generator<IterItem<DossierLegislatifDocumentResult>>;
+export declare function iterLoadSenatDossiersLegislatifsRapports(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifDocumentResult>>;
+export declare function iterLoadSenatDossiersLegislatifsTextes(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifDocumentResult>>;
 export declare function loadSenatTexteContent(dataDir: string, textePathFromDataset: string): IterItem<FlatTexte | null>;
 export declare function iterLoadSenatEvenements(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<AgendaEvent>>;
 export declare function iterLoadSenatCirconscriptions(dataDir: string, options?: {}): Generator<IterItem<CirconscriptionResult>>;

package/lib/loaders.js

@@ -59,8 +59,8 @@ export function* iterLoadSenatDossiersLegislatifs(dataDir, session, options = {}
         yield dossierLegislatifItem;
     }
 }
-export function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
-    let itemsDir = path.join(dataDir, TEXTE_FOLDER, DATA_ORIGINAL_FOLDER);
+export function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
+    let itemsDir = path.join(dataDir, RAPPORT_FOLDER);
     if (session) {
         itemsDir = path.join(itemsDir, session.toString());
     }
@@ -75,8 +75,8 @@ export function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
         }
     }
 }
-export function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
-    let itemsDir = path.join(dataDir, RAPPORT_FOLDER);
+export function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
+    let itemsDir = path.join(dataDir, TEXTE_FOLDER, DATA_ORIGINAL_FOLDER);
     if (session) {
         itemsDir = path.join(itemsDir, session.toString());
     }
@@ -91,34 +91,44 @@ export function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
         }
     }
 }
-export function* iterLoadSenatDossiersLegislatifsTextes(dataDir, session, options = {}) {
+export function* iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, documentType, options = {}) {
     for (const { item: dossierLegislatif } of iterLoadSenatDossiersLegislatifs(dataDir, session, options)) {
         for (const lecture of dossierLegislatif.lectures) {
             const lecturesSenat = lecture.lectures_assemblee.filter((lectureAssemblee) => lectureAssemblee.assemblee === "Sénat");
             for (const lectureSenat of lecturesSenat) {
-                for (const texte of lectureSenat.textes) {
-                    const enrichedTexte = {
+                for (const document of lectureSenat[documentType]) {
+                    const enrichedDocument = {
                         signet_dossier: dossierLegislatif.signet,
                         url_dossier_senat: dossierLegislatif.url,
                         url_dossier_assemblee_nationale: dossierLegislatif.url_dossier_assemblee_nationale,
                         type_lecture: lecture.type_lecture,
                         libelle_lecture: lecture.libelle,
                         libelle_organisme: lectureSenat.libelle_organisme,
-                        ...texte,
+                        ...document,
                     };
-                    const texteItem = {
-                        item: enrichedTexte,
+                    const documentItem = {
+                        item: enrichedDocument,
                     };
-                    if (texte.url) {
-                        const texteName = path.parse(texte.url).name;
-                        texteItem.filePathFromDataset = path.join(`${texte.session ?? UNDEFINED_SESSION}`, texteName, `${texteName}.pdf`);
+                    if (document.url) {
+                        const documentName = path.parse(document.url).name;
+                        documentItem.filePathFromDataset = path.join(`${document.session ?? UNDEFINED_SESSION}`, documentName, `${documentName}.pdf`);
                     }
-                    yield texteItem;
+                    yield documentItem;
                 }
             }
         }
     }
 }
+export function* iterLoadSenatDossiersLegislatifsRapports(dataDir, session, options = {}) {
+    for (const iterItem of iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, "rapports", options)) {
+        yield iterItem;
+    }
+}
+export function* iterLoadSenatDossiersLegislatifsTextes(dataDir, session, options = {}) {
+    for (const iterItem of iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, "textes", options)) {
+        yield iterItem;
+    }
+}
 export function loadSenatTexteContent(dataDir, textePathFromDataset) {
     const parsedTextePath = path.parse(textePathFromDataset);
     const jsonTexteName = `${parsedTextePath.name}.json`;

package/lib/model/agenda.js

@@ -71,7 +71,10 @@ function transformAgenda(document, fileName) {
         const { startTime, endTime } = getStartAndEndTimes(timeOriginal);
         const titre = eventElement.querySelector(".titre")?.textContent?.trim() || null;
         const organe = eventElement.querySelector(".organe")?.textContent?.trim() || null;
-        const objet = eventElement.querySelector(".objet")?.textContent?.trim() || null;
+        const objet = eventElement.querySelector(".objet")?.textContent
+            ?.trim()
+            ?.replace(/^- /, "")
+            || null;
         const lieu = eventElement.querySelector(".lieu")?.textContent || null;
         const url_dossier_senat = getUrlDossierSenat(eventElement.querySelectorAll(".lien a"));
         agendaEvents.push({

package/lib/model/dosleg.d.ts

@@ -107,22 +107,24 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
             textes: {
                 url: string;
                 date: string;
+                id: string | null;
+                type: string;
+                session: string | null;
                 auteurs: {
                     prenom: string | null;
                     nom_usuel: string;
                     matricule: string | null;
                 }[];
                 numero: string | null;
-                id: string | null;
-                origine_texte: string;
-                type_texte: string;
-                session: string | null;
+                origine: string;
             }[];
             rapports: {
-                date_depot: string;
                 url: string;
+                date: string;
                 numero: string | null;
-                type_rapport: string;
+                id: string | null;
+                type: string;
+                session: string;
                 auteurs: {
                     prenom: string | null;
                     nom_usuel: string;
@@ -173,22 +175,24 @@ export declare function findAll(): AsyncIterableIterator<{
             textes: {
                 url: string;
                 date: string;
+                id: string | null;
+                type: string;
+                session: string | null;
                 auteurs: {
                     prenom: string | null;
                     nom_usuel: string;
                     matricule: string | null;
                 }[];
                 numero: string | null;
-                id: string | null;
-                origine_texte: string;
-                type_texte: string;
-                session: string | null;
+                origine: string;
             }[];
             rapports: {
-                date_depot: string;
                 url: string;
+                date: string;
                 numero: string | null;
-                type_rapport: string;
+                id: string | null;
+                type: string;
+                session: string;
                 auteurs: {
                     prenom: string | null;
                     nom_usuel: string;

package/lib/model/dosleg.js

@@ -40,7 +40,13 @@ function rapports(lectureAssembleeId) {
         .where("lecassrap.lecassidt", "=", lectureAssembleeId)
         .select(({ eb, ref, val }) => [
         "rap.rapnum as numero",
-        rtrim(ref("denrap.libdenrap")).as("type_rapport"),
+        eb
+            .case()
+            .when("rap.typurl", "=", "I")
+            .then(removeSubstring(ref("rap.rapurl"), val(".html")))
+            .else(null)
+            .end()
+            .as("id"),
         eb
             .case()
             .when("rap.typurl", "=", "I")
@@ -48,7 +54,9 @@ function rapports(lectureAssembleeId) {
             .else(rtrim(ref("rap.rapurl")))
             .end()
             .as("url"),
-        toDateString(ref("rap.date_depot")).as("date_depot"),
+        rtrim(ref("denrap.libdenrap")).as("type"),
+        toDateString(ref("rap.date_depot")).as("date"),
+        "sesann as session",
         auteursRapport(ref("rap.rapcod")).as("auteurs"),
         organismesRapport(ref("rap.rapcod")).as("organismes"),
     ]));
@@ -87,8 +95,8 @@ function textes(lectureAssembleeId) {
             .else(rtrim(ref("texte.texurl")))
             .end()
             .as("url"),
-        rtrim(ref("oritxt.oritxtlib")).as("origine_texte"),
-        rtrim(ref("typtxt.typtxtlib")).as("type_texte"),
+        rtrim(ref("oritxt.oritxtlib")).as("origine"),
+        rtrim(ref("typtxt.typtxtlib")).as("type"),
         toDateString(ref("texte.txtoritxtdat")).as("date"),
         "sesann as session",
         auteursTexte(ref("texte.texcod")).as("auteurs"),

package/package.json

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