@tricoteuses/senat 3.0.1 → 3.1.0

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/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 & {

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";

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/lib/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/documents.ts","../src/index.ts","../src/scrutins.ts","../src/strings.ts","../src/util.ts","../src/kanel_types/ameli.ts","../src/kanel_types/debats.ts","../src/kanel_types/dosleg.ts","../src/kanel_types/questions.ts","../src/kanel_types/sens.ts","../src/kysely_types/ameli/Amd.ts","../src/kysely_types/ameli/Amdsen.ts","../src/kysely_types/ameli/Avicom.ts","../src/kysely_types/ameli/Avigvt.ts","../src/kysely_types/ameli/Cab.ts","../src/kysely_types/ameli/ComAmeli.ts","../src/kysely_types/ameli/Database.ts","../src/kysely_types/ameli/Ent.ts","../src/kysely_types/ameli/Etatxt.ts","../src/kysely_types/ameli/Fbu.ts","../src/kysely_types/ameli/GrppolAmeli.ts","../src/kysely_types/ameli/Gvt.ts","../src/kysely_types/ameli/Intora.ts","../src/kysely_types/ameli/Irr.ts","../src/kysely_types/ameli/LecAmeli.ts","../src/kysely_types/ameli/Mot.ts","../src/kysely_types/ameli/Nat.ts","../src/kysely_types/ameli/Orarol.ts","../src/kysely_types/ameli/Sai.ts","../src/kysely_types/ameli/Saisen.ts","../src/kysely_types/ameli/Sea.ts","../src/kysely_types/ameli/SenAmeli.ts","../src/kysely_types/ameli/SenatSchema.ts","../src/kysely_types/ameli/Ses.ts","../src/kysely_types/ameli/Sor.ts","../src/kysely_types/ameli/Sub.ts","../src/kysely_types/ameli/TxtAmeli.ts","../src/kysely_types/ameli/Typrect.ts","../src/kysely_types/ameli/Typses.ts","../src/kysely_types/ameli/Typsub.ts","../src/kysely_types/ameli/WNivrec.ts","../src/kysely_types/debats/Database.ts","../src/kysely_types/debats/Debats.ts","../src/kysely_types/debats/Intdivers.ts","../src/kysely_types/debats/Intpjl.ts","../src/kysely_types/debats/Lecassdeb.ts","../src/kysely_types/debats/Secdis.ts","../src/kysely_types/debats/Secdivers.ts","../src/kysely_types/debats/SenatSchema.ts","../src/kysely_types/debats/Syndeb.ts","../src/kysely_types/debats/Typsec.ts","../src/kysely_types/dosleg/Amescr.ts","../src/kysely_types/dosleg/Ass.ts","../src/kysely_types/dosleg/Aud.ts","../src/kysely_types/dosleg/Auteur.ts","../src/kysely_types/dosleg/Ble.ts","../src/kysely_types/dosleg/Catrap.ts","../src/kysely_types/dosleg/Corscr.ts","../src/kysely_types/dosleg/Database.ts","../src/kysely_types/dosleg/DateSeance.ts","../src/kysely_types/dosleg/Deccoc.ts","../src/kysely_types/dosleg/Denrap.ts","../src/kysely_types/dosleg/Doc.ts","../src/kysely_types/dosleg/Docatt.ts","../src/kysely_types/dosleg/Docsea.ts","../src/kysely_types/dosleg/Ecr.ts","../src/kysely_types/dosleg/Etaloi.ts","../src/kysely_types/dosleg/Evtsea.ts","../src/kysely_types/dosleg/Forpub.ts","../src/kysely_types/dosleg/Gen.ts","../src/kysely_types/dosleg/Lecass.ts","../src/kysely_types/dosleg/Lecassrap.ts","../src/kysely_types/dosleg/Lecture.ts","../src/kysely_types/dosleg/Lnkrap.ts","../src/kysely_types/dosleg/Loi.ts","../src/kysely_types/dosleg/Loithe.ts","../src/kysely_types/dosleg/Natloi.ts","../src/kysely_types/dosleg/Org.ts","../src/kysely_types/dosleg/Orgnomhis.ts","../src/kysely_types/dosleg/Orippr.ts","../src/kysely_types/dosleg/Oritxt.ts","../src/kysely_types/dosleg/Posvot.ts","../src/kysely_types/dosleg/Qua.ts","../src/kysely_types/dosleg/Rap.ts","../src/kysely_types/dosleg/Raporg.ts","../src/kysely_types/dosleg/Rapthe.ts","../src/kysely_types/dosleg/Rolsig.ts","../src/kysely_types/dosleg/Scr.ts","../src/kysely_types/dosleg/SenatSchema.ts","../src/kysely_types/dosleg/Ses.ts","../src/kysely_types/dosleg/Stavot.ts","../src/kysely_types/dosleg/Texte.ts","../src/kysely_types/dosleg/TexteAncien.ts","../src/kysely_types/dosleg/The.ts","../src/kysely_types/dosleg/Titsen.ts","../src/kysely_types/dosleg/Typatt.ts","../src/kysely_types/dosleg/Typaut.ts","../src/kysely_types/dosleg/Typdoc.ts","../src/kysely_types/dosleg/Typevtsea.ts","../src/kysely_types/dosleg/Typlec.ts","../src/kysely_types/dosleg/Typloi.ts","../src/kysely_types/dosleg/Typorg.ts","../src/kysely_types/dosleg/Typrap.ts","../src/kysely_types/dosleg/Typtxt.ts","../src/kysely_types/dosleg/Typurl.ts","../src/kysely_types/dosleg/Votsen.ts","../src/kysely_types/questions/Database.ts","../src/kysely_types/questions/Etatquestion.ts","../src/kysely_types/questions/Legquestion.ts","../src/kysely_types/questions/Naturequestion.ts","../src/kysely_types/questions/SenatSchema.ts","../src/kysely_types/questions/Sortquestion.ts","../src/kysely_types/questions/TamMinisteres.ts","../src/kysely_types/questions/TamQuestions.ts","../src/kysely_types/questions/TamReponses.ts","../src/kysely_types/questions/The.ts","../src/kysely_types/sens/Activite.ts","../src/kysely_types/sens/ActiviteDelegation.ts","../src/kysely_types/sens/ActiviteLoi.ts","../src/kysely_types/sens/ActiviteParticipant.ts","../src/kysely_types/sens/ActiviteSenateur.ts","../src/kysely_types/sens/ActivitesLiees.ts","../src/kysely_types/sens/Actpro.ts","../src/kysely_types/sens/Adresse.ts","../src/kysely_types/sens/Asster.ts","../src/kysely_types/sens/Bur.ts","../src/kysely_types/sens/CategorieActivite.ts","../src/kysely_types/sens/Com.ts","../src/kysely_types/sens/Csp.ts","../src/kysely_types/sens/Database.ts","../src/kysely_types/sens/Delega.ts","../src/kysely_types/sens/Design.ts","../src/kysely_types/sens/Designoep.ts","../src/kysely_types/sens/Designorg.ts","../src/kysely_types/sens/Dpt.ts","../src/kysely_types/sens/Dptele.ts","../src/kysely_types/sens/Dpttypman.ts","../src/kysely_types/sens/Ele.ts","../src/kysely_types/sens/Elucan.ts","../src/kysely_types/sens/Eludep.ts","../src/kysely_types/sens/Eludiv.ts","../src/kysely_types/sens/Elueur.ts","../src/kysely_types/sens/Elureg.ts","../src/kysely_types/sens/Elusen.ts","../src/kysely_types/sens/Eluter.ts","../src/kysely_types/sens/Elutit.ts","../src/kysely_types/sens/Eluvil.ts","../src/kysely_types/sens/Etadebman.ts","../src/kysely_types/sens/Etafinman.ts","../src/kysely_types/sens/Etasen.ts","../src/kysely_types/sens/FonactParticipant.ts","../src/kysely_types/sens/Foncom.ts","../src/kysely_types/sens/Fondelega.ts","../src/kysely_types/sens/Fongrppol.ts","../src/kysely_types/sens/Fongrpsen.ts","../src/kysely_types/sens/Fonmemcom.ts","../src/kysely_types/sens/Fonmemdelega.ts","../src/kysely_types/sens/Fonmemgrppol.ts","../src/kysely_types/sens/Fonmemgrpsen.ts","../src/kysely_types/sens/Fonmemorg.ts","../src/kysely_types/sens/Fonorg.ts","../src/kysely_types/sens/Grppol.ts","../src/kysely_types/sens/Grpsenami.ts","../src/kysely_types/sens/Libcom.ts","../src/kysely_types/sens/Libdelega.ts","../src/kysely_types/sens/Libgrppol.ts","../src/kysely_types/sens/Libgrpsen.ts","../src/kysely_types/sens/Liborg.ts","../src/kysely_types/sens/Mel.ts","../src/kysely_types/sens/Memcom.ts","../src/kysely_types/sens/Memdelega.ts","../src/kysely_types/sens/Memextpar.ts","../src/kysely_types/sens/Memgrppol.ts","../src/kysely_types/sens/Memgrpsen.ts","../src/kysely_types/sens/Memorg.ts","../src/kysely_types/sens/Minind.ts","../src/kysely_types/sens/Mismin.ts","../src/kysely_types/sens/Missen.ts","../src/kysely_types/sens/Moddes.ts","../src/kysely_types/sens/Nation.ts","../src/kysely_types/sens/Nationgrpsen.ts","../src/kysely_types/sens/Org.ts","../src/kysely_types/sens/Orgext.ts","../src/kysely_types/sens/Orgthe.ts","../src/kysely_types/sens/Pcs.ts","../src/kysely_types/sens/Pcs24.ts","../src/kysely_types/sens/Pcs42.ts","../src/kysely_types/sens/Pcs8.ts","../src/kysely_types/sens/Pcscatpro.ts","../src/kysely_types/sens/Poicon.ts","../src/kysely_types/sens/Qua.ts","../src/kysely_types/sens/Reg.ts","../src/kysely_types/sens/Sen.ts","../src/kysely_types/sens/SenatSchema.ts","../src/kysely_types/sens/Senbur.ts","../src/kysely_types/sens/Sennom.ts","../src/kysely_types/sens/Senurl.ts","../src/kysely_types/sens/Stajur.ts","../src/kysely_types/sens/Telephone.ts","../src/kysely_types/sens/Temval.ts","../src/kysely_types/sens/Territ.ts","../src/kysely_types/sens/Titele.ts","../src/kysely_types/sens/Typadr.ts","../src/kysely_types/sens/Typapppol.ts","../src/kysely_types/sens/Typbister.ts","../src/kysely_types/sens/TypeActivite.ts","../src/kysely_types/sens/TypeActiviteParticipant.ts","../src/kysely_types/sens/TypeActiviteSenateur.ts","../src/kysely_types/sens/TypeCategorie.ts","../src/kysely_types/sens/Typele.ts","../src/kysely_types/sens/Typgrpsen.ts","../src/kysely_types/sens/Typman.ts","../src/kysely_types/sens/Typorg.ts","../src/kysely_types/sens/Typurl.ts","../src/kysely_types/sens/Typvoi.ts","../src/kysely_types/sens/Zongeo.ts","../src/other_types/agenda.ts","../src/other_types/compte_rendu.ts","../src/other_types/sens.ts","../src/other_types/sessions.ts","../src/other_types/texte.ts","../src/parsers/texte.ts","../src/rich_types/ameli.ts","../src/rich_types/debats.ts","../src/rich_types/dosleg.ts","../src/rich_types/questions.ts","../src/rich_types/sens.ts","../src/schemas/config.ts","../src/scripts/convert_data.ts","../src/scripts/convert_xml_to_html.ts","../src/scripts/data-download.ts","../src/scripts/datautil.ts","../src/scripts/retrieve_agenda.ts","../src/scripts/retrieve_cr_commission.ts","../src/scripts/retrieve_cr_seance.ts","../src/scripts/retrieve_documents.ts","../src/scripts/retrieve_open_data.ts","../src/scripts/retrieve_senateurs_photos.ts","../src/scripts/retrieve_videos.ts","../src/scripts/validate_prefixed_tables.ts","../src/scripts/shared/cli_helpers.ts","../src/scripts/shared/incremental_import_sql.ts","../src/scripts/shared/make_generate_zod_schemas.ts","../src/scripts/shared/prefixed_tables.ts","../src/scripts/shared/schema_version.ts","../src/scripts/shared/staging_import.ts","../src/scripts/shared/staging_metadata_sql.ts","../src/scripts/shared/util.ts","../src/server/agenda.ts","../src/server/ameli.ts","../src/server/commission.ts","../src/server/config.ts","../src/server/conversion_textes.ts","../src/server/databases_postgres.ts","../src/server/datasets.ts","../src/server/debats.ts","../src/server/documents.ts","../src/server/dosleg.ts","../src/server/git.ts","../src/server/index.ts","../src/server/loaders.ts","../src/server/questions.ts","../src/server/scrutins.ts","../src/server/seance.ts","../src/server/sens.ts","../src/typings/windows-1252.d.ts","../src/utils/cr_spliting.ts","../src/utils/date.ts","../src/utils/nvs-parsing.ts","../src/utils/reunion_odj_building.ts","../src/utils/reunion_parsing.ts","../src/utils/scoring.ts","../src/utils/string_cleaning.ts","../src/videos/config.ts","../src/videos/index.ts","../src/videos/match.ts","../src/videos/pipeline.ts","../src/videos/search.ts","../src/videos/types.ts","../tests/incrementalImportSql.test.ts","../tests/prefixedTables.test.ts","../tests/schemaVersion.test.ts","../tests/test_iter_load.test.ts","../tests/validatePrefixedTables.test.ts","../tests/videoMatching.test.ts"],"version":"5.9.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "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"
   },
@@ -46,7 +50,6 @@
     "access": "public"
   },
   "scripts": {
-    "postinstall": "patch-package",
     "build": "tsc",
     "build:types": "tsc --emitDeclarationOnly",
     "data:convert_data": "tsx src/scripts/convert_data.ts",
@@ -93,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",
@@ -100,9 +104,9 @@
     "eslint": "^9.39.2",
     "globals": "^17.0.0",
     "kanel": "^4.0.1",
+    "kanel-kysely": "^4.0.0",
     "kanel-zod": "^4.0.0",
-    "patch-package": "^8.0.1",
-    "postinstall-postinstall": "^2.1.0",
+    "kysely": "^0.28.16",
     "prettier": "^3.5.3",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",