@tricoteuses/senat 3.0.2 → 3.1.1

package/lib/src/server/sens.js

@@ -0,0 +1,353 @@
+import { sql } from "kysely";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { db, streamRawQuery } from "./databases_postgres.js";
+export async function* findAll() {
+    const compiledQuery = db
+        .withSchema("senat")
+        .selectFrom("sens_sen as sen")
+        .leftJoin("sens_etasen as etasen", "etasen.etasencod", "sen.etasencod")
+        .leftJoin("sens_pcs as pcs", "pcs.pcscod", "sen.pcscod")
+        .leftJoin("sens_pcs42 as pcs42", "pcs42.pcs42cod", "pcs.pcs42cod")
+        .leftJoin("sens_pcs24 as pcs24", "pcs24.pcs24cod", "pcs42.pcs24cod")
+        .leftJoin("sens_pcs8 as pcs8", "pcs8.pcs8cod", "pcs24.pcs8cod")
+        .leftJoin("sens_grppol as grppol", "grppol.grppolcod", "sen.sengrppolcodcou")
+        .leftJoin("sens_com as com", "com.orgcod", "sen.sencomcodcou")
+        .select((eb) => [
+        "sen.senmat as matricule",
+        "sen.quacod as qualite",
+        "sen.sennomuse as nom_usuel",
+        "sen.senprenomuse as prenom_usuel",
+        "sen.etasencod as etat",
+        sql `to_char(${eb.ref("sen.sendatnai")}, 'YYYY-MM-DD')`.as("date_naissance"),
+        sql `to_char(${eb.ref("sen.sendatdec")}, 'YYYY-MM-DD')`.as("date_deces"),
+        "sen.sengrppolcodcou as code_groupe_politique",
+        "sen.sengrppolliccou as groupe_politique",
+        "sen.sencomcodcou as code_commission_permanente",
+        "com.comlilmin as commission_permanente",
+        sql `${eb.ref("sen.sencirnumcou")}::text`.as("code_circonscription"),
+        "sen.sencircou as circonscription",
+        "sen.senburliccou as fonction_bureau_senat",
+        "sen.senema as courrier_electronique",
+        sql `pcs.pcslil`.as("PCS_INSEE"),
+        sql `pcs42.pcs42lib`.as("PCS_INSEE_42"),
+        sql `pcs24.pcs24lib`.as("PCS_INSEE_24"),
+        sql `pcs8.pcs8lil`.as("PCS_INSEE_8"),
+        "sen.sendespro as description_profession",
+        sql `${eb.ref("sen.sennumsie")}::text`.as("siege"),
+        "sen.sendaiurl as url_hatvp",
+        // URLs
+        jsonArrayFrom(eb
+            .withSchema("senat")
+            .selectFrom("sens_senurl as senurl")
+            .select(["senurl.typurlcod as code_url", "senurl.senurlurl as url", "senurl.senurlnumtri as order_num"])
+            .whereRef("senurl.senmat", "=", "sen.senmat")
+            .orderBy("senurl.senurlnumtri", "asc")).as("urls"),
+        // Mandats sénatoriaux
+        jsonArrayFrom(eb
+            .withSchema("senat")
+            .selectFrom("sens_elusen as elusen")
+            .leftJoin("sens_etadebman as etadebman", "etadebman.etadebmancod", "elusen.etadebmancod")
+            .leftJoin("sens_etafinman as etafinman", "etafinman.etafinmancod", "elusen.etafinmancod")
+            .select([
+            sql `elusen.dptnum::text`.as("code_circonscription"),
+            sql `to_char(elusen.eludatdeb, 'YYYY-MM-DD')`.as("date_debut"),
+            sql `to_char(elusen.eludatfin, 'YYYY-MM-DD')`.as("date_fin"),
+            "elusen.temvalcod as etat",
+            "etadebman.etadebmanlib as etat_debut",
+            "etafinman.etafinman as etat_fin",
+            "elusen.eludatdeb as order_date",
+        ])
+            .whereRef("elusen.senmat", "=", "sen.senmat")
+            .orderBy("elusen.eludatdeb", (ob) => ob.desc().nullsLast())).as("mandats_senateur"),
+        // Commissions
+        jsonArrayFrom(eb
+            .withSchema("senat")
+            .selectFrom("sens_memcom as memcom")
+            .leftJoin("sens_com as com2", "com2.orgcod", "memcom.orgcod")
+            .leftJoin("sens_typorg as typorg", "typorg.typorgcod", "com2.typorgcod")
+            .select((eb2) => [
+            "memcom.orgcod as code_organisme",
+            sql `to_char(memcom.memcomdatdeb, 'YYYY-MM-DD')`.as("date_debut"),
+            sql `to_char(memcom.memcomdatfin, 'YYYY-MM-DD')`.as("date_fin"),
+            "memcom.temvalcod as etat",
+            "com2.comlilmin as libelle",
+            "com2.typorgcod as type_code_organisme",
+            "typorg.typorglib as type_organisme",
+            "memcom.memcomdatdeb as order_date",
+            // Fonctions dans la commission
+            jsonArrayFrom(eb2
+                .withSchema("senat")
+                .selectFrom("sens_fonmemcom as fonmemcom")
+                .leftJoin("sens_foncom as foncom", "foncom.foncomcod", "fonmemcom.foncomcod")
+                .select([
+                sql `to_char(fonmemcom.fonmemcomdatdeb, 'YYYY-MM-DD')`.as("date_debut"),
+                sql `to_char(fonmemcom.fonmemcomdatfin, 'YYYY-MM-DD')`.as("date_fin"),
+                sql `coalesce(
+                    nullif(foncom.foncomlib, ''),
+                    nullif(foncom.foncomlil, ''),
+                    nullif(foncom.foncomlic, ''))`.as("libelle"),
+                "fonmemcom.fonmemcomdatdeb as order_date",
+            ])
+                .whereRef("fonmemcom.memcomid", "=", "memcom.memcomid")
+                .orderBy("fonmemcom.fonmemcomdatdeb", (ob) => ob.desc().nullsLast())).as("fonctions"),
+        ])
+            .whereRef("memcom.senmat", "=", "sen.senmat")
+            .orderBy("memcom.memcomdatdeb", (ob) => ob.desc().nullsLast())).as("commissions"),
+        // Délégations
+        jsonArrayFrom(eb
+            .withSchema("senat")
+            .selectFrom("sens_memdelega as memdelega")
+            .leftJoin("sens_delega as delega", "delega.orgcod", "memdelega.orgcod")
+            .leftJoin("sens_designorg as designorg", "designorg.designcod", "memdelega.designcod")
+            .leftJoin("sens_typorg as typorg2", "typorg2.typorgcod", "delega.typorgcod")
+            .select((eb2) => [
+            "memdelega.orgcod as code_organisme",
+            sql `to_char(memdelega.memdelegadatdeb, 'YYYY-MM-DD')`.as("date_debut"),
+            sql `to_char(memdelega.memdelegadatfin, 'YYYY-MM-DD')`.as("date_fin"),
+            "memdelega.temvalcod as etat",
+            "delega.evelib as libelle",
+            "delega.typorgcod as type_code_organisme",
+            "typorg2.typorglib as type_organisme",
+            "memdelega.memdelegadatdeb as order_date",
+            // Fonctions dans la délégation
+            jsonArrayFrom(eb2
+                .withSchema("senat")
+                .selectFrom("sens_fonmemdelega as fonmemdelega")
+                .leftJoin("sens_fondelega as fondelega", "fondelega.fondelcod", "fonmemdelega.fondelcod")
+                .select([
+                sql `to_char(fonmemdelega.fonmemdeldatdeb, 'YYYY-MM-DD')`.as("date_debut"),
+                sql `to_char(fonmemdelega.fonmemdeldatfin, 'YYYY-MM-DD')`.as("date_fin"),
+                sql `coalesce(
+                    nullif(fondelega.fondellib, ''),
+                    nullif(fondelega.fondellil, ''),
+                    nullif(fondelega.fondellic, ''))`.as("libelle"),
+                "fonmemdelega.fonmemdeldatdeb as order_date",
+            ])
+                .whereRef("fonmemdelega.memdelegaid", "=", "memdelega.memdelegaid")
+                .orderBy("fonmemdelega.fonmemdeldatdeb", (ob) => ob.desc().nullsLast())).as("fonctions"),
+        ])
+            .whereRef("memdelega.senmat", "=", "sen.senmat")
+            .orderBy("memdelega.memdelegadatdeb", (ob) => ob.desc().nullsLast())).as("delegations"),
+        // Groupes politiques
+        jsonArrayFrom(eb
+            .withSchema("senat")
+            .selectFrom("sens_memgrppol as memgrppol")
+            .leftJoin("sens_grppol as grppol2", "grppol2.grppolcod", "memgrppol.grppolcod")
+            .leftJoin("sens_typapppol as typapppol", "typapppol.typapppolcod", "memgrppol.typapppolcod")
+            .leftJoin("sens_typorg as typorg3", "typorg3.typorgcod", "grppol2.typorgcod")
+            .select((eb2) => [
+            "memgrppol.grppolcod as code_organisme",
+            sql `to_char(memgrppol.memgrppoldatdeb, 'YYYY-MM-DD')`.as("date_debut"),
+            sql `to_char(memgrppol.memgrppoldatfin, 'YYYY-MM-DD')`.as("date_fin"),
+            "memgrppol.temvalcod as etat",
+            "grppol2.grppollibcou as libelle",
+            "grppol2.typorgcod as type_code_organisme",
+            "typorg3.typorglib as type_organisme",
+            "memgrppol.memgrppoldatdeb as order_date",
+            // Fonctions dans le groupe politique
+            jsonArrayFrom(eb2
+                .withSchema("senat")
+                .selectFrom("sens_fonmemgrppol as fonmemgrppol")
+                .leftJoin("sens_fongrppol as fongrppol", "fongrppol.fongrppolcod", "fonmemgrppol.fongrppolcod")
+                .select([
+                sql `to_char(fonmemgrppol.fonmemgrppoldatdeb, 'YYYY-MM-DD')`.as("date_debut"),
+                sql `to_char(fonmemgrppol.fonmemgrppoldatfin, 'YYYY-MM-DD')`.as("date_fin"),
+                sql `coalesce(
+                    nullif(fongrppol.fongrppollib, ''),
+                    nullif(fongrppol.fongrppollil, ''),
+                    nullif(fongrppol.fongrppollic, ''))`.as("libelle"),
+                "fonmemgrppol.fonmemgrppoldatdeb as order_date",
+            ])
+                .whereRef("fonmemgrppol.memgrppolid", "=", "memgrppol.memgrppolid")
+                .orderBy("fonmemgrppol.fonmemgrppoldatdeb", (ob) => ob.desc().nullsLast())).as("fonctions"),
+        ])
+            .whereRef("memgrppol.senmat", "=", "sen.senmat")
+            .orderBy("memgrppol.memgrppoldatdeb", (ob) => ob.desc().nullsLast())).as("groupes"),
+        // Fonctions au bureau du Sénat
+        jsonArrayFrom(eb
+            .withSchema("senat")
+            .selectFrom("sens_senbur as senbur")
+            .leftJoin("sens_bur as bur", "bur.burcod", "senbur.burcod")
+            .select([
+            sql `to_char(senbur.senburdatdeb, 'YYYY-MM-DD')`.as("date_debut"),
+            sql `to_char(senbur.senburdatfin, 'YYYY-MM-DD')`.as("date_fin"),
+            sql `coalesce(nullif(bur.burlib, ''), nullif(bur.burlil, ''), nullif(bur.burlic, ''))`.as("libelle"),
+            "senbur.senburdatdeb as order_date",
+        ])
+            .whereRef("senbur.senmat", "=", "sen.senmat")
+            .orderBy("senbur.senburdatdeb", (ob) => ob.desc().nullsLast())).as("fonctions_bureau"),
+        // Points de contact
+        jsonArrayFrom(eb
+            .withSchema("senat")
+            .selectFrom("sens_poicon as poicon")
+            .select((eb2) => [
+            sql `poicon.poiconid::text`.as("id"),
+            "poicon.typpoiconcod as type",
+            "poicon.poiconlib as libelle",
+            "poicon.poiconnumtri as order_num",
+            // Adresses
+            jsonArrayFrom(eb2
+                .withSchema("senat")
+                .selectFrom("sens_adresse as adresse")
+                .select([
+                "adresse.adrnumvoi as numero_voie",
+                "adresse.adrnomvoi as nom_voie",
+                "adresse.adrcmp as complement",
+                "adresse.adrcmp2 as complement2",
+                "adresse.adrcodpos as code_postal",
+                "adresse.adrcom as commune",
+                "adresse.adrcdxcod as code_cedex",
+                "adresse.adrcdxlib as libelle_cedex",
+                "adresse.adrburdis as bureau_distributeur",
+                "adresse.adrnumtri as order_num",
+            ])
+                .whereRef("adresse.poiconid", "=", "poicon.poiconid")
+                .orderBy("adresse.adrnumtri", "asc")).as("adresses"),
+            // Téléphones
+            jsonArrayFrom(eb2
+                .withSchema("senat")
+                .selectFrom("sens_telephone as telephone")
+                .select([
+                "telephone.typtelcod as type",
+                "telephone.telnum as numero",
+                "telephone.telnumtri as order_num",
+            ])
+                .whereRef("telephone.poiconid", "=", "poicon.poiconid")
+                .orderBy("telephone.telnumtri", "asc")).as("telephones"),
+        ])
+            .whereRef("poicon.senmat", "=", "sen.senmat")
+            .orderBy("poicon.poiconnumtri", "asc")).as("points_contact"),
+    ])
+        .compile();
+    for await (const row of streamRawQuery(compiledQuery)) {
+        yield {
+            ...row,
+            commissions: row.commissions ?? [],
+            delegations: row.delegations ?? [],
+            fonctions_bureau: row.fonctions_bureau ?? [],
+            groupes: row.groupes ?? [],
+            mandats_senateur: row.mandats_senateur ?? [],
+            points_contact: row.points_contact ?? [],
+            urls: row.urls ?? [],
+        };
+    }
+}
+export async function* findAllCirconscriptions() {
+    const compiledQuery = db
+        .withSchema("senat")
+        .selectFrom("sens_dpt as dpt")
+        .leftJoin("sens_reg as reg", "reg.regcod", "dpt.regcod")
+        .select((eb) => [
+        sql `${eb.ref("dpt.dptnum")}::text`.as("identifiant"),
+        "dpt.dptcod as code",
+        "dpt.dptlib as libelle_departement",
+        "dpt.dptart as article",
+        "reg.reglib as libelle_region",
+        "dpt.temvalcod as etat",
+        sql `to_char(${eb.ref("dpt.dptdatdeb")}, 'YYYY-MM-DD')`.as("date_debut"),
+        sql `to_char(${eb.ref("dpt.dptdatfin")}, 'YYYY-MM-DD')`.as("date_fin"),
+        sql `${eb.ref("dpt.dptnbrsen")}::text`.as("nombre_senateurs"),
+        "dpt.dpturlcmp as url",
+    ])
+        .compile();
+    yield* streamRawQuery(compiledQuery);
+}
+export async function* findAllOrganismes() {
+    const compiledQuery = db
+        .withSchema("senat")
+        .selectFrom(db
+        .withSchema("senat")
+        .selectFrom("sens_com as com")
+        .select([
+        "com.orgcod",
+        "com.evelic",
+        "com.evelib",
+        "com.evelil",
+        "com.typorgcod",
+        "com.orgurlsim",
+        "com.orgdatcre",
+        "com.orgdatfin",
+        "com.temvalcod",
+    ])
+        .union(db
+        .withSchema("senat")
+        .selectFrom("sens_delega as delega")
+        .select([
+        "delega.orgcod",
+        "delega.evelic",
+        "delega.evelib",
+        "delega.evelil",
+        "delega.typorgcod",
+        "delega.orgurlsim",
+        "delega.orgdatcre",
+        "delega.orgdatfin",
+        "delega.temvalcod",
+    ]))
+        .union(db
+        .withSchema("senat")
+        .selectFrom("sens_grppol as grppol")
+        .select([
+        "grppol.grppolcod as orgcod",
+        "grppol.grppolliccou as evelic",
+        "grppol.grppollibcou as evelib",
+        "grppol.grppollilcou as evelil",
+        "grppol.typorgcod",
+        "grppol.grppolurlsim as orgurlsim",
+        "grppol.grppoldatcre as orgdatcre",
+        "grppol.grppoldatfin as orgdatfin",
+        "grppol.temvalcod",
+    ]))
+        .union(db
+        .withSchema("senat")
+        .selectFrom("sens_grpsenami as grpsenami")
+        .select([
+        "grpsenami.orgcod",
+        "grpsenami.evelic",
+        "grpsenami.evelib",
+        "grpsenami.evelil",
+        "grpsenami.typorgcod",
+        "grpsenami.orgurlsim",
+        "grpsenami.orgdatcre",
+        "grpsenami.orgdatfin",
+        "grpsenami.temvalcod",
+    ]))
+        .union(db
+        .withSchema("senat")
+        .selectFrom("sens_org as org")
+        .select([
+        "org.orgcod",
+        "org.evelic",
+        "org.evelib",
+        "org.evelil",
+        "org.typorgcod",
+        "org.orgurlsim",
+        "org.orgdatcre",
+        "org.orgdatfin",
+        "org.temvalcod",
+    ]))
+        .as("all_organismes"))
+        .leftJoin("sens_typorg as typorg", "typorg.typorgcod", "all_organismes.typorgcod")
+        .select((eb) => [
+        "all_organismes.orgcod as code",
+        "all_organismes.evelic as libelle_court",
+        "all_organismes.evelib as libelle",
+        sql `rtrim(${eb.ref("all_organismes.evelil")})`.as("libelle_long"),
+        "all_organismes.typorgcod as type_code",
+        sql `rtrim(${eb.ref("typorg.typorglib")})`.as("type_libelle"),
+        sql `'https://www.senat.fr' || ${eb.ref("all_organismes.orgurlsim")}`.as("url"),
+        sql `to_char(${eb.ref("all_organismes.orgdatcre")}, 'YYYY-MM-DD')`.as("date_debut"),
+        sql `to_char(${eb.ref("all_organismes.orgdatfin")}, 'YYYY-MM-DD')`.as("date_fin"),
+        "all_organismes.temvalcod as etat",
+    ])
+        .compile();
+    yield* streamRawQuery(compiledQuery);
+}
+export async function* findActif() {
+    const compiledQuery = db
+        .withSchema("senat")
+        .selectFrom("sens_sen as sen")
+        .select(["sen.senmat", "sen.sennomuse", "sen.senprenomuse"])
+        .where("sen.etasencod", "=", "ACTIF")
+        .compile();
+    yield* streamRawQuery(compiledQuery);
+}

package/lib/src/types/debats.d.ts

@@ -1,2 +1,2 @@
-import { Debats, Lecassdeb } from "../raw_types/debats";
-export type { Debats as Debat, Lecassdeb as LecAssDeb };
+import { debats as Debat, lecassdeb as LecAssDeb } from "../raw_types_schemats/debats";
+export type { Debat, LecAssDeb };

package/lib/src/util.d.ts

@@ -0,0 +1 @@
+export declare function toCRDate(dateISO: string, startTime?: string | null): string;

package/lib/src/util.js

@@ -0,0 +1,15 @@
+export function toCRDate(dateISO, startTime) {
+    const yyyymmdd = dateISO.replace(/-/g, ""); // "20250716"
+    let hh = "00", mm = "00", ss = "00", SSS = "000";
+    if (startTime) {
+        // accepte "HH:MM:SS", "HH:MM:SS.mmm", "HH:MM:SS.mmm+02:00"
+        const m = startTime.match(/(\d{2}):(\d{2}):(\d{2})(?:\.(\d{3}))?/);
+        if (m) {
+            hh = m[1];
+            mm = m[2];
+            ss = m[3];
+            SSS = m[4] || "000";
+        }
+    }
+    return `${yyyymmdd}${hh}${mm}${ss}${SSS}`;
+}

package/lib/src/utils/cr_spliting.d.ts

@@ -1,4 +1,4 @@
-import { Reunion } from "../types/agenda.js";
+import { Reunion } from "../other_types/agenda.js";
 type MetadataDay = {
     date: string;
     openTime?: string;

package/lib/src/utils/cr_spliting.js

@@ -1,8 +1,8 @@
 import path from "path";
 import * as cheerio from "cheerio";
-import { AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders.js";
+import { AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER } from "../server/loaders.js";
 import fs from "fs-extra";
-import { sessionStartYearFromDate } from "../model/seance.js";
+import { sessionStartYearFromDate } from "../server/seance.js";
 import { frDateToISO, hourShortToStartTime } from "./date.js";
 import { normalizeSpaces } from "./string_cleaning.js";
 function extractWeekStartFromHead($) {

package/lib/src/utils/nvs-parsing.d.ts

@@ -8,7 +8,7 @@ export declare function pickBestLevel1ChapterForAgenda(chapters: L1Chapter[], ag
     chapter: L1Chapter;
     score: number;
 } | null;
-export declare function getAgendaSegmentTimecodes(dataNvs: string, finalPlayerNvs: string, agendaTitleOrObjet: string): {
+export declare function getAgendaSegmentTimecodes(dataNvs: string, finalPlayerNvs: string, agendaTitleOrObjet: string[]): {
     start: number;
     end: number | null;
     chapterId: string;

package/lib/src/utils/nvs-parsing.js

@@ -60,7 +60,15 @@ export function getAgendaSegmentTimecodes(dataNvs, finalPlayerNvs, agendaTitleOr
     const l1 = getLevel1Chapters(dataNvs);
     if (!l1.length)
         return null;
-    const best = pickBestLevel1ChapterForAgenda(l1, agendaTitleOrObjet);
+    const agendaCandidates = agendaTitleOrObjet;
+    let best = null;
+    for (const agendaCandidate of agendaCandidates) {
+        const candidateBest = pickBestLevel1ChapterForAgenda(l1, agendaCandidate);
+        if (!candidateBest)
+            continue;
+        if (!best || candidateBest.score > best.score)
+            best = candidateBest;
+    }
     if (!best)
         return null;
     const chapter = best.chapter;

package/lib/src/utils/reunion_odj_building.d.ts

@@ -1,6 +1,6 @@
 import commandLineArgs from "command-line-args";
-import { ActeLegislatif, DossierLegislatifResult } from "../model/dosleg.js";
-import { AgendaEvent, ReunionOdj } from "../types/agenda.js";
+import { ActeLegislatif, DossierLegislatifResult } from "../rich_types/dosleg.js";
+import { AgendaEvent, ReunionOdj } from "../other_types/agenda.js";
 type DossierWithActes = DossierLegislatifResult & {
     actes_legislatifs?: ActeLegislatif[] | null;
 };

package/lib/src/utils/reunion_odj_building.js

@@ -1,5 +1,5 @@
-import { getSessionsFromStart } from "../types/sessions.js";
-import { iterLoadSenatDossiersLegislatifs } from "../loaders.js";
+import { getSessionsFromStart } from "../other_types/sessions.js";
+import { iterLoadSenatDossiersLegislatifs } from "../server/loaders.js";
 export function buildOdj(events, dossierBySenatUrl) {
     const byObjet = new Map(); // objet -> set de dossier uids
     let codeEtape = null;

package/lib/src/utils/reunion_parsing.d.ts

@@ -1,7 +1,7 @@
 import { DateTime } from "luxon";
 import type { AnyNode } from "domhandler";
-import { AgendaEvent, Reunion } from "../types/agenda.js";
-import { DossierLegislatifResult } from "../model/dosleg.js";
+import { AgendaEvent, Reunion } from "../other_types/agenda.js";
+import { DossierLegislatifResult } from "../rich_types/dosleg.js";
 import * as cheerio from "cheerio";
 type KnownType = "SP" | "COM" | "MC" | "OD" | "ID";
 type DossierBySenatUrl = Record<string, DossierLegislatifResult>;

package/lib/src/utils/scoring.d.ts

@@ -1,4 +1,4 @@
-import { AgendaEvent, Reunion } from "../types/agenda.js";
+import { AgendaEvent, Reunion } from "../other_types/agenda.js";
 import { VideoScoreSignals, VideoScoreWeights } from "../videos/types.js";
 import { L1Chapter } from "./nvs-parsing.js";
 export declare function jaccard(a: Set<string>, b: Set<string>): number;

package/lib/src/videos/match.d.ts

@@ -1,5 +1,5 @@
 import { CommandLineOptions } from "command-line-args";
-import { Reunion } from "../types/agenda.js";
+import { Reunion } from "../other_types/agenda.js";
 import { Candidate, MatchResult, MatchWeights } from "./types.js";
 export declare function matchOneReunion(args: {
     agenda: Reunion;

package/lib/src/videos/pipeline.d.ts

@@ -1,4 +1,4 @@
-import { Reunion } from "../types/agenda.js";
+import { Reunion } from "../other_types/agenda.js";
 import { BestMatch, LastForVideo, MatchContext } from "./types.js";
 import { CommandLineOptions } from "command-line-args";
 type VideoPipelineOptions = CommandLineOptions & {
@@ -17,7 +17,7 @@ export declare function processOneReunionMatch(args: {
         agendaJsonPath: string;
         start: number;
     }>;
-    getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
+    getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string[]) => {
         start: number;
         end: number | null;
     } | null;
@@ -40,13 +40,13 @@ export declare function processBisIfNeeded(args: {
         options: VideoPipelineOptions;
         writeIfChanged: (p: string, content: string) => Promise<void>;
         lastByVideo: Map<string, LastForVideo>;
-        getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
+        getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string[]) => {
             start: number;
             end: number | null;
         } | null;
         buildSenatVodMasterM3u8FromNvs: (dataNvs: string) => string | null;
     }) => Promise<void>;
-    getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
+    getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string[]) => {
         start: number;
         end: number | null;
     } | null;

package/lib/src/videos/pipeline.js

@@ -1,4 +1,4 @@
-import { AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders.js";
+import { AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER } from "../server/loaders.js";
 import { epochToParisDateTime } from "../utils/date.js";
 import { SENAT_DATAS_ROOT } from "./config.js";
 import { fetchText } from "./search.js";
@@ -34,8 +34,8 @@ export async function processOneReunionMatch(args) {
     }
     let timecodeDebutVideo = null;
     let timecodeFinVideo = null;
-    const agendaKey = agenda.titre || agenda.objet || "";
-    const seg = getAgendaSegmentTimecodes(dataTxt, finalTxt, agendaKey);
+    const agendaKeys = [agenda.objet ?? "", agenda.titre ?? ""];
+    const seg = getAgendaSegmentTimecodes(dataTxt, finalTxt, agendaKeys);
     if (seg) {
         timecodeDebutVideo = seg.start;
         timecodeFinVideo = null; // keep open by default

package/lib/src/videos/search.d.ts

@@ -1,5 +1,5 @@
 import { CommandLineOptions } from "command-line-args";
-import { Reunion } from "../types/agenda.js";
+import { Reunion } from "../other_types/agenda.js";
 import { Candidate, SearchParams } from "./types.js";
 export declare function fetchText(url: string): Promise<string | null>;
 export declare function fetchBuffer(url: string): Promise<Buffer | null>;

package/lib/tests/test_iter_load.test.js

@@ -2,7 +2,7 @@ import fs from "fs";
 import os from "os";
 import path from "path";
 import { describe, it, expect } from "vitest";
-import { COMPTES_RENDUS_FOLDER, DATA_TRANSFORMED_FOLDER, iterLoadSenatComptesRendusSeances } from "../src/loaders.js";
+import { COMPTES_RENDUS_FOLDER, DATA_TRANSFORMED_FOLDER, iterLoadSenatComptesRendusSeances, } from "../src/server/index.js";
 describe("iterLoadSenatComptesRendusSeances", () => {
     it("loads comptes rendus from transformed/session folder", () => {
         const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "senat-cr-"));

package/lib/tests/validatePrefixedTables.test.js

@@ -1,6 +1,6 @@
 import { readFileSync } from "fs";
 import { describe, expect, it } from "vitest";
-import { datasets } from "../src/datasets.js";
+import { datasets } from "../src/server/datasets.js";
 import { extractPrefixedTableNamesFromGeneratedManifest, getGeneratedTableManifestPath, } from "../src/scripts/shared/prefixed_tables.js";
 describe("generated raw types coverage", () => {
     it("maps each generated dataset definition to prefixed senat tables", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "3.0.2",
+  "version": "3.1.1",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",
@@ -36,9 +36,13 @@
       "import": "./lib/src/index.js",
       "types": "./lib/src/index.d.ts"
     },
-    "./loaders": {
-      "import": "./lib/src/loaders.js",
-      "types": "./lib/src/loaders.d.ts"
+    "./kysely": {
+      "import": "./lib/src/kysely/index.js",
+      "types": "./lib/src/kysely/index.d.ts"
+    },
+    "./server": {
+      "import": "./lib/src/server/index.js",
+      "types": "./lib/src/server/index.d.ts"
     },
     "./package.json": "./package.json"
   },
@@ -92,6 +96,7 @@
     "@types/jsdom": "^27.0.0",
     "@types/luxon": "^3.7.1",
     "@types/node": "^24.10.1",
+    "@types/pg": "^8.20.0",
     "@types/slug": "^5.0.9",
     "@typescript-eslint/eslint-plugin": "^8.52.0",
     "@typescript-eslint/parser": "^8.52.0",
@@ -99,7 +104,9 @@
     "eslint": "^9.39.2",
     "globals": "^17.0.0",
     "kanel": "^4.0.1",
+    "kanel-kysely": "^4.0.0",
     "kanel-zod": "^4.0.0",
+    "kysely": "^0.28.16",
     "prettier": "^3.5.3",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",

package/lib/add-js-extensions-v2.js

@@ -1,23 +0,0 @@
-import { glob } from "glob";
-import fs from "fs";
-import path from "path";
-async function main() {
-    const files = await glob(["src/**/*.ts", "tests/**/*.ts"]);
-    for (const file of files) {
-        let content = fs.readFileSync(file, "utf8");
-        content = content.replace(/(from|import)\s+(["'])(\.\.?\/[^"']+)\2/g, (match, p1, p2, p3) => {
-            if (p3.endsWith(".js"))
-                return match;
-            const dir = path.dirname(file);
-            const targetPath = path.resolve(dir, p3);
-            if (fs.existsSync(targetPath) && fs.lstatSync(targetPath).isDirectory()) {
-                return `${p1} ${p2}${p3}/index.js${p2}`;
-            }
-            else {
-                return `${p1} ${p2}${p3}.js${p2}`;
-            }
-        });
-        fs.writeFileSync(file, content);
-    }
-}
-main();

package/lib/add-js-extensions.js

@@ -1,17 +0,0 @@
-import { glob } from "glob";
-import fs from "fs";
-async function main() {
-    const files = await glob("src/**/*.ts");
-    for (const file of files) {
-        let content = fs.readFileSync(file, "utf8");
-        // Matches: from "./foo" or import "./foo"
-        // Regex: (from|import) + (quote) + (relative_path) + (same_quote)
-        content = content.replace(/(from|import)\s+(["'])(\.\.?\/[^"']+)\2/g, (match, p1, p2, p3) => {
-            if (p3.endsWith(".js"))
-                return match;
-            return `${p1} ${p2}${p3}.js${p2}`;
-        });
-        fs.writeFileSync(file, content);
-    }
-}
-main();