@tricoteuses/senat 3.1.20 → 3.1.21

package/lib/src/videos/match.js

@@ -98,16 +98,16 @@ export async function matchOneReunion(args) {
     // Accept threshold (best must pass)
     if (best.score < minAccept) {
         if (!options["silent"])
-            console.log(`[threshold] ${agenda.uid} score=${best.score.toFixed(2)}
-          agenda title="${agenda.titre ?? ""}"
+            console.log(`[threshold] ${agenda.uid} score=${best.score.toFixed(2)}
+          agenda title="${agenda.titre ?? ""}"
           best title="${best.vtitle ?? ""}"`);
         return null;
     }
     // Margin (confidence) gate
     if (second && best.score - second.score < margin) {
         if (!options["silent"]) {
-            console.log(`[Margin] ${agenda.uid} score=${best.score.toFixed(2)}
-          agenda title="${agenda.titre ?? ""}" agenda date="${agenda.startTime ?? ""}"
+            console.log(`[Margin] ${agenda.uid} score=${best.score.toFixed(2)}
+          agenda title="${agenda.titre ?? ""}" agenda date="${agenda.startTime ?? ""}"
           best title="${best.vtitle ?? ""}" date="${best.epoch ? new Date(best.epoch * 1000).toISOString() : "null"}"`);
             console.log("second title=", second.vtitle ?? "", " score=", second.score.toFixed(2), "date=", second.epoch ? new Date(second.epoch * 1000).toISOString() : "null");
         }

package/lib/tests/collaborateurs.test.js

@@ -0,0 +1,115 @@
+import { describe, expect, it } from "vitest";
+import { construireLignesCollaborateurs, extraireDateEdition, normaliserPourComparaison, parseCellulePersonne, } from "../src/parsers/collaborateurs.js";
+// Bandes x mesurées sur le vrai PDF : employeur ≈ 147, collaborateur ≈ 285.
+const X_EMPLOYEUR = 147;
+const X_COLLABORATEUR = 285;
+/** Construit une page synthétique : pour chaque ligne, [employeur?, collaborateur]. */
+function pageItems(lignes, page = 1) {
+    const items = [];
+    let y = 700;
+    for (const [employeur, collaborateur] of lignes) {
+        if (employeur)
+            items.push({ str: employeur, x: X_EMPLOYEUR, y, page });
+        items.push({ str: collaborateur, x: X_COLLABORATEUR, y, page });
+        y -= 15;
+    }
+    return items;
+}
+describe("parseCellulePersonne", () => {
+    it("sépare civilité, nom et prénom", () => {
+        expect(parseCellulePersonne("M. CHAREF Dahmane")).toEqual({ civilite: "M.", nom: "CHAREF", prenom: "Dahmane" });
+        expect(parseCellulePersonne("Mme OLIVIER Béatrice")).toEqual({
+            civilite: "Mme",
+            nom: "OLIVIER",
+            prenom: "Béatrice",
+        });
+    });
+    it("gère les noms composés (plusieurs jetons en majuscules)", () => {
+        expect(parseCellulePersonne("Mme MAZENOT CHAPPUY Sophie")).toEqual({
+            civilite: "Mme",
+            nom: "MAZENOT CHAPPUY",
+            prenom: "Sophie",
+        });
+        expect(parseCellulePersonne("M. DI FOLCO Camille")).toEqual({ civilite: "M.", nom: "DI FOLCO", prenom: "Camille" });
+    });
+    it("gère les particules nobiliaires en tête de nom (de, de la)", () => {
+        expect(parseCellulePersonne("Mme de CIDRAC Marta")).toEqual({ civilite: "Mme", nom: "de CIDRAC", prenom: "Marta" });
+        expect(parseCellulePersonne("Mme de LA GONTRIE Marie-Pierre")).toEqual({
+            civilite: "Mme",
+            nom: "de LA GONTRIE",
+            prenom: "Marie-Pierre",
+        });
+        expect(parseCellulePersonne("M. de LEGGE Dominique")).toEqual({
+            civilite: "M.",
+            nom: "de LEGGE",
+            prenom: "Dominique",
+        });
+        expect(parseCellulePersonne("Mme APOURCEAU-POLY Cathy")).toEqual({
+            civilite: "Mme",
+            nom: "APOURCEAU-POLY",
+            prenom: "Cathy",
+        });
+    });
+    it("conserve un prénom tronqué tel quel", () => {
+        expect(parseCellulePersonne("Mme AESCHLIMANN Marie-Do")).toEqual({
+            civilite: "Mme",
+            nom: "AESCHLIMANN",
+            prenom: "Marie-Do",
+        });
+    });
+    it("ignore le marqueur (*) de congé non rémunéré", () => {
+        expect(parseCellulePersonne("M. DURAND (*) Paul")).toEqual({ civilite: "M.", nom: "DURAND", prenom: "Paul" });
+    });
+    it("renvoie null pour une cellule vide ou une civilité seule", () => {
+        expect(parseCellulePersonne("")).toBeNull();
+        expect(parseCellulePersonne("M.")).toBeNull();
+    });
+});
+describe("construireLignesCollaborateurs", () => {
+    it("rattache plusieurs collaborateurs au sénateur courant (report quand l'employeur est vide)", () => {
+        const items = pageItems([
+            ["Mme AESCHLIMANN Marie-Do", "M. CHAREF Dahmane"],
+            [null, "M. POURQUERY Alexandre"],
+            [null, "M. SEBRIER Valentin"],
+            ["M. ALLIZARD Pascal", "Mme OLIVIER Béatrice"],
+        ]);
+        const lignes = construireLignesCollaborateurs(items);
+        expect(lignes).toHaveLength(4);
+        expect(lignes.slice(0, 3).every((l) => l.senateur.nom === "AESCHLIMANN")).toBe(true);
+        expect(lignes[3].senateur.nom === "ALLIZARD" && lignes[3].collaborateur.nom === "OLIVIER").toBe(true);
+    });
+    it("ignore en-têtes, pieds de page et numéros, et gère plusieurs pages", () => {
+        const items = [
+            { str: "Liste des collaborateurs par Sénateur", x: 208, y: 760, page: 1 },
+            { str: "Employeur", x: 193, y: 740, page: 1 },
+            { str: "Nom Collaborateur", x: 342, y: 740, page: 1 },
+            ...pageItems([["M. BACCI Jean", "Mme BOILLOT Julie"]], 1),
+            { str: "Edition du 24/06/2026", x: 40, y: 30, page: 1 },
+            { str: "- 1 -", x: 296, y: 30, page: 1 },
+            ...pageItems([["Mme BÉLIM Audrey", "M. BOUCHER Thibault"]], 2),
+        ];
+        const lignes = construireLignesCollaborateurs(items);
+        expect(lignes).toHaveLength(2);
+        expect(lignes[0].senateur.nom).toBe("BACCI");
+        expect(lignes[1].senateur.nom).toBe("BÉLIM");
+    });
+    it("n'émet rien tant qu'aucun employeur n'a été rencontré", () => {
+        const orphelin = [{ str: "M. ORPHELIN Jean", x: X_COLLABORATEUR, y: 700, page: 1 }];
+        expect(construireLignesCollaborateurs(orphelin)).toHaveLength(0);
+    });
+});
+describe("extraireDateEdition", () => {
+    it("extrait la date d'édition du pied de page", () => {
+        const date = extraireDateEdition(["…", "Edition du 24/06/2026", "(*) Congé non rémunéré"]);
+        expect(date?.toISOString().slice(0, 10)).toBe("2026-06-24");
+    });
+    it("renvoie null si absente", () => {
+        expect(extraireDateEdition(["rien ici"])).toBeNull();
+    });
+});
+describe("normaliserPourComparaison", () => {
+    it("met en majuscules, retire les accents et compacte les espaces", () => {
+        expect(normaliserPourComparaison("  Béatrice   ")).toBe("BEATRICE");
+        expect(normaliserPourComparaison("Bélim")).toBe("BELIM");
+    });
+});

package/package.json

@@ -1,117 +1,117 @@
-{
-  "name": "@tricoteuses/senat",
-  "version": "3.1.20",
-  "description": "Handle French Sénat's open data",
-  "keywords": [
-    "France",
-    "open data",
-    "Parliament",
-    "Sénat"
-  ],
-  "author": "Emmanuel Raviart <emmanuel@raviart.com>",
-  "contributors": [
-    "Henry Boisgibault <henry.boisgibault@proton.me>",
-    "Pierre Drege <dregop@proton.me>",
-    "Hélène Jonin <helene.jonin@gmail.com>",
-    "Paul-Henry Ngounou <ngpaulhenry@gmail.com>"
-  ],
-  "bugs": {
-    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat/issues"
-  },
-  "homepage": "https://tricoteuses.fr/",
-  "license": "AGPL-3.0-or-later",
-  "repository": {
-    "type": "git",
-    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat.git"
-  },
-  "type": "module",
-  "engines": {
-    "node": ">=22"
-  },
-  "files": [
-    "lib"
-  ],
-  "exports": {
-    ".": {
-      "import": "./lib/src/index.js",
-      "types": "./lib/src/index.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"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "tsc",
-    "build:types": "tsc --emitDeclarationOnly",
-    "data:convert_data": "tsx src/scripts/convert_data.ts",
-    "data:download": "tsx src/scripts/data-download.ts",
-    "data:generate_schemas": "tsx src/scripts/retrieve_open_data.ts --schema",
-    "data:retrieve_agenda": "cross-env TZ='Etc/UTC' tsx src/scripts/retrieve_agenda.ts",
-    "data:retrieve_cr_seance": "tsx src/scripts/retrieve_cr_seance.ts",
-    "data:retrieve_cr_commission": "tsx src/scripts/retrieve_cr_commission.ts",
-    "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
-    "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --all",
-    "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",
-    "data:retrieve_videos": "tsx src/scripts/retrieve_videos.ts",
-    "data:validate_prefixed_tables": "tsx src/scripts/validate_prefixed_tables.ts",
-    "lint": "eslint src",
-    "lint:fix": "eslint src --fix",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm run build",
-    "prettier": "prettier --write 'src/**/*.ts'",
-    "test:iter_load": "vitest tests/test_iter_load.test.ts",
-    "type-check": "tsc --noEmit",
-    "type-check:watch": "npm run type-check -- --watch",
-    "test:video-matching": "vitest tests/videoMatching.test.ts",
-    "test:prefixed-tables": "vitest tests/prefixedTables.test.ts tests/validatePrefixedTables.test.ts"
-  },
-  "dependencies": {
-    "cheerio": "^1.1.2",
-    "command-line-args": "^6.0.1",
-    "dotenv": "^17.3.1",
-    "fast-xml-parser": "^5.3.3",
-    "fs-extra": "^11.3.3",
-    "jsdom": "^27.2.0",
-    "luxon": "^3.7.2",
-    "node-stream-zip": "^1.8.2",
-    "p-limit": "^7.2.0",
-    "pg-cursor": "^2.19.0",
-    "postgres": "^3.4.8",
-    "slug": "^11.0.0",
-    "windows-1252": "^3.0.4",
-    "zod": "^4.3.5"
-  },
-  "devDependencies": {
-    "@types/cheerio": "^1.0.0",
-    "@types/command-line-args": "^5.0.0",
-    "@types/fs-extra": "^11.0.4",
-    "@types/jsdom": "^27.0.0",
-    "@types/luxon": "^3.7.1",
-    "@types/node": "^24.10.1",
-    "@types/pg": "^8.20.0",
-    "@types/pg-cursor": "^2.7.2",
-    "@types/slug": "^5.0.9",
-    "@typescript-eslint/eslint-plugin": "^8.52.0",
-    "@typescript-eslint/parser": "^8.52.0",
-    "cross-env": "^10.1.0",
-    "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",
-    "vitest": "^4.0.18"
-  }
-}
+{
+  "name": "@tricoteuses/senat",
+  "version": "3.1.21",
+  "description": "Handle French Sénat's open data",
+  "keywords": [
+    "France",
+    "open data",
+    "Parliament",
+    "Sénat"
+  ],
+  "author": "Emmanuel Raviart <emmanuel@raviart.com>",
+  "contributors": [
+    "Henry Boisgibault <henry.boisgibault@proton.me>",
+    "Pierre Drege <dregop@proton.me>",
+    "Hélène Jonin <helene.jonin@gmail.com>",
+    "Paul-Henry Ngounou <ngpaulhenry@gmail.com>"
+  ],
+  "bugs": {
+    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat/issues"
+  },
+  "homepage": "https://tricoteuses.fr/",
+  "license": "AGPL-3.0-or-later",
+  "repository": {
+    "type": "git",
+    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat.git"
+  },
+  "type": "module",
+  "engines": {
+    "node": ">=22"
+  },
+  "files": [
+    "lib"
+  ],
+  "exports": {
+    ".": {
+      "import": "./lib/src/index.js",
+      "types": "./lib/src/index.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"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc",
+    "build:types": "tsc --emitDeclarationOnly",
+    "data:convert_data": "tsx src/scripts/convert_data.ts",
+    "data:download": "tsx src/scripts/data-download.ts",
+    "data:generate_schemas": "tsx src/scripts/retrieve_open_data.ts --schema",
+    "data:retrieve_agenda": "cross-env TZ='Etc/UTC' tsx src/scripts/retrieve_agenda.ts",
+    "data:retrieve_cr_seance": "tsx src/scripts/retrieve_cr_seance.ts",
+    "data:retrieve_cr_commission": "tsx src/scripts/retrieve_cr_commission.ts",
+    "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
+    "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --all",
+    "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",
+    "data:retrieve_videos": "tsx src/scripts/retrieve_videos.ts",
+    "data:validate_prefixed_tables": "tsx src/scripts/validate_prefixed_tables.ts",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm run build",
+    "prettier": "prettier --write 'src/**/*.ts'",
+    "test:iter_load": "vitest tests/test_iter_load.test.ts",
+    "type-check": "tsc --noEmit",
+    "type-check:watch": "npm run type-check -- --watch",
+    "test:video-matching": "vitest tests/videoMatching.test.ts",
+    "test:prefixed-tables": "vitest tests/prefixedTables.test.ts tests/validatePrefixedTables.test.ts"
+  },
+  "dependencies": {
+    "cheerio": "^1.1.2",
+    "command-line-args": "^6.0.1",
+    "dotenv": "^17.3.1",
+    "fast-xml-parser": "^5.3.3",
+    "fs-extra": "^11.3.3",
+    "jsdom": "^27.2.0",
+    "luxon": "^3.7.2",
+    "node-stream-zip": "^1.8.2",
+    "p-limit": "^7.2.0",
+    "pg-cursor": "^2.19.0",
+    "postgres": "^3.4.8",
+    "slug": "^11.0.0",
+    "windows-1252": "^3.0.4",
+    "zod": "^4.3.5"
+  },
+  "devDependencies": {
+    "@types/cheerio": "^1.0.0",
+    "@types/command-line-args": "^5.0.0",
+    "@types/fs-extra": "^11.0.4",
+    "@types/jsdom": "^27.0.0",
+    "@types/luxon": "^3.7.1",
+    "@types/node": "^24.10.1",
+    "@types/pg": "^8.20.0",
+    "@types/pg-cursor": "^2.7.2",
+    "@types/slug": "^5.0.9",
+    "@typescript-eslint/eslint-plugin": "^8.52.0",
+    "@typescript-eslint/parser": "^8.52.0",
+    "cross-env": "^10.1.0",
+    "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",
+    "vitest": "^4.0.18"
+  }
+}

package/lib/src/config.d.ts

@@ -1,21 +0,0 @@
-import "dotenv/config";
-import { z } from "zod";
-export declare const configSchema: z.ZodObject<{
-    db: z.ZodObject<{
-        host: z.ZodString;
-        name: z.ZodString;
-        password: z.ZodString;
-        port: z.ZodCoercedNumber<unknown>;
-        user: z.ZodString;
-    }, z.core.$strip>;
-}, z.core.$strip>;
-declare const _default: {
-    db: {
-        host: string;
-        name: string;
-        password: string;
-        port: number;
-        user: string;
-    };
-};
-export default _default;

package/lib/src/config.js

@@ -1,27 +0,0 @@
-import "dotenv/config";
-import { z } from "zod";
-const dbSchema = z.object({
-    host: z.string().trim().min(1, "Must not be empty"),
-    name: z.string().trim().min(1, "Must not be empty"),
-    password: z.string().trim().min(1, "Must not be empty"),
-    port: z.coerce.number().int().min(0).max(65535),
-    user: z.string().trim().min(1, "Must not be empty"),
-});
-export const configSchema = z.object({
-    db: dbSchema,
-});
-const config = {
-    db: {
-        host: process.env["TRICOTEUSES_SENAT_DB_HOST"] || "localhost",
-        name: process.env["TRICOTEUSES_SENAT_DB_NAME"] || "postgres",
-        password: process.env["TRICOTEUSES_SENAT_DB_PASSWORD"] || "opendata",
-        port: process.env["TRICOTEUSES_SENAT_DB_PORT"] || 5432,
-        user: process.env["TRICOTEUSES_SENAT_DB_USER"] || "opendata",
-    },
-};
-const result = configSchema.safeParse(config);
-if (!result.success) {
-    console.error(`Error in configuration:\n${JSON.stringify(config, null, 2)}\nError:\n${JSON.stringify(result.error.issues, null, 2)}`);
-    process.exit(-1);
-}
-export default result.data;

package/lib/src/conversion_textes.d.ts

@@ -1,11 +0,0 @@
-export interface SenatMetadata {
-    number: string | null;
-    session: string | null;
-    date: string | null;
-    type: string | null;
-    authors: string | null;
-    title: string | null;
-    commission: string | null;
-}
-export declare function extractMetadata(xmlDoc: Document): SenatMetadata;
-export declare function convertSenatXmlToHtml(texteXml: string, outputFilePath: string): Promise<void>;