@tricoteuses/senat 3.1.22 → 3.1.24

package/lib/src/videos/pipeline.js

@@ -5,6 +5,14 @@ import { fetchText } from "./search.js";
 import fs from "fs-extra";
 import fsp from "fs/promises";
 import path from "path";
+function log(options, ...args) {
+    if (!options["silent"])
+        console.log(...args);
+}
+function warn(options, ...args) {
+    if (!options["silent"])
+        console.warn(...args);
+}
 function isReunion(value) {
     return typeof value === "object" && value !== null && "uid" in value;
 }
@@ -18,18 +26,18 @@ export async function processOneReunionMatch(args) {
         finalTxt = await fsp.readFile(path.join(baseDir, "finalplayer.nvs"), "utf-8");
     }
     catch {
-        console.warn(`[skip] Missing NVS files for reunion ${reunionUid}`);
+        warn(options, `[skip] Missing NVS files for reunion ${reunionUid}`);
         return;
     }
     const master = buildSenatVodMasterM3u8FromNvs(dataTxt);
     if (!master) {
-        console.warn(`[warn] Cannot build m3u8 for reunion ${reunionUid}`);
+        warn(options, `[warn] Cannot build m3u8 for reunion ${reunionUid}`);
         return;
     }
     const agendaJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agenda.uid}.json`);
     // Ensure it exists first.
     if (!(await fs.pathExists(agendaJsonPath))) {
-        console.warn(`[warn] agenda file not found: ${agendaJsonPath}`);
+        warn(options, `[warn] agenda file not found: ${agendaJsonPath}`);
         return;
     }
     let timecodeDebutVideo = null;
@@ -46,7 +54,7 @@ export async function processOneReunionMatch(args) {
         if (prev && prev.agendaJsonPath !== agendaJsonPath) {
             // micro-safety: do not close with an earlier timecode
             if (timecodeDebutVideo <= prev.start) {
-                console.warn("[warn] timecode order inversion on same video: " +
+                warn(options, "[warn] timecode order inversion on same video: " +
                     `prev=${prev.agendaUid}(${prev.start}s) -> ` +
                     `cur=${agenda.uid}(${timecodeDebutVideo}s). ` +
                     "Skip closing prev to avoid negative segment.");
@@ -55,6 +63,7 @@ export async function processOneReunionMatch(args) {
                 await patchAgendaTimecodeFin({
                     agendaJsonPath: prev.agendaJsonPath,
                     timecodeFinVideo: timecodeDebutVideo,
+                    options,
                     writeIfChanged,
                 });
             }
@@ -68,11 +77,11 @@ export async function processOneReunionMatch(args) {
         obj = JSON.parse(raw);
     }
     catch {
-        console.warn(`[warn] invalid JSON in ${agendaJsonPath}`);
+        warn(options, `[warn] invalid JSON in ${agendaJsonPath}`);
         return;
     }
     if (!isReunion(obj)) {
-        console.warn(`[warn] invalid reunion payload in ${agendaJsonPath}`);
+        warn(options, `[warn] invalid reunion payload in ${agendaJsonPath}`);
         return;
     }
     const next = { ...obj, urlVideo: master, startTime: agenda.startTime, urlPageVideo: best?.pageUrl };
@@ -84,10 +93,8 @@ export async function processOneReunionMatch(args) {
             delete next.timecodeFinVideo;
     }
     await writeIfChanged(agendaJsonPath, JSON.stringify(next, null, 2));
-    if (!options["silent"]) {
-        console.log(`[write] ${agenda.uid} urlVideo ← ${master}` +
-            (timecodeDebutVideo != null ? ` (timecodeDebutVideo ← ${timecodeDebutVideo}s)` : ""));
-    }
+    log(options, `[write] ${agenda.uid} urlVideo ← ${master}` +
+        (timecodeDebutVideo != null ? ` (timecodeDebutVideo ← ${timecodeDebutVideo}s)` : ""));
 }
 export async function processBisIfNeeded(args) {
     const { agenda, secondBest, ctx, skipDownload, options, lastByVideo, writeIfChanged, processOneReunionMatch, getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs, } = args;
@@ -106,7 +113,7 @@ export async function processBisIfNeeded(args) {
     };
     const baseDirBis = path.join(path.dirname(ctx.baseDir), bisUid);
     await fs.ensureDir(baseDirBis);
-    await ensureBisAgendaJson({ agenda, agendaBis, dataDir: ctx.dataDir, session: ctx.session });
+    await ensureBisAgendaJson({ agenda, agendaBis, dataDir: ctx.dataDir, session: ctx.session, options });
     await downloadNvsForMatch(secondBest, baseDirBis);
     await processOneReunionMatch({
         agenda: agendaBis,
@@ -122,26 +129,26 @@ export async function processBisIfNeeded(args) {
     });
 }
 async function ensureBisAgendaJson(args) {
-    const { agenda, agendaBis, dataDir, session } = args;
+    const { agenda, agendaBis, dataDir, session, options } = args;
     const agendaJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agenda.uid}.json`);
     const agendaBisJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agendaBis.uid}.json`);
     if (!(await fs.pathExists(agendaJsonPath))) {
-        console.warn(`[bis] original agenda json not found to clone: ${agendaJsonPath}`);
+        warn(options, `[bis] original agenda json not found to clone: ${agendaJsonPath}`);
         return;
     }
     try {
         const raw = await fsp.readFile(agendaJsonPath, "utf-8");
         const obj = JSON.parse(raw);
         if (!obj || typeof obj !== "object" || Array.isArray(obj)) {
-            console.warn(`[bis] cannot clone agenda json: expected object in ${agendaJsonPath}, ` +
+            warn(options, `[bis] cannot clone agenda json: expected object in ${agendaJsonPath}, ` +
                 `got ${Array.isArray(obj) ? "array" : typeof obj}`);
             return;
         }
         await writeIfChanged(agendaBisJsonPath, JSON.stringify(agendaBis, null, 2));
-        console.log(`[bis] created agenda json ${agendaBis.uid}.json from ${agenda.uid}.json`);
+        log(options, `[bis] created agenda json ${agendaBis.uid}.json from ${agenda.uid}.json`);
     }
     catch (e) {
-        console.warn(`[bis] cannot clone agenda json ${agenda.uid}.json -> ${agendaBis.uid}.json:`, e?.message);
+        warn(options, `[bis] cannot clone agenda json ${agenda.uid}.json -> ${agendaBis.uid}.json:`, e?.message);
     }
 }
 async function downloadNvsForMatch(best, baseDir) {
@@ -164,7 +171,7 @@ export async function writeIfChanged(p, content) {
     await fsp.writeFile(p, content, "utf-8");
 }
 async function patchAgendaTimecodeFin(args) {
-    const { agendaJsonPath, timecodeFinVideo, writeIfChanged } = args;
+    const { agendaJsonPath, timecodeFinVideo, options, writeIfChanged } = args;
     if (!(await fs.pathExists(agendaJsonPath)))
         return;
     const raw = await fsp.readFile(agendaJsonPath, "utf-8");
@@ -173,11 +180,11 @@ async function patchAgendaTimecodeFin(args) {
         obj = JSON.parse(raw);
     }
     catch {
-        console.warn(`[warn] invalid JSON in ${agendaJsonPath}`);
+        warn(options, `[warn] invalid JSON in ${agendaJsonPath}`);
         return;
     }
     if (typeof obj !== "object" || obj === null || Array.isArray(obj)) {
-        console.warn(`[warn] invalid reunion payload in ${agendaJsonPath}`);
+        warn(options, `[warn] invalid reunion payload in ${agendaJsonPath}`);
         return;
     }
     const next = { ...obj, timecodeFinVideo };

package/lib/tests/collaborateurs.test.js

@@ -0,0 +1,115 @@
+import { describe, expect, it } from "vitest";
+import { buildCollaboratorRows, extractEditionDate, normalizeForComparison, parsePersonCell, } from "../src/parsers/collaborateurs.js";
+// X bands measured on the real PDF: employer ≈ 147, collaborator ≈ 285.
+const X_EMPLOYER = 147;
+const X_COLLABORATOR = 285;
+/** Builds a synthetic page: for each row, [employer?, collaborator]. */
+function pageItems(rows, page = 1) {
+    const items = [];
+    let y = 700;
+    for (const [employer, collaborator] of rows) {
+        if (employer)
+            items.push({ str: employer, x: X_EMPLOYER, y, page });
+        items.push({ str: collaborator, x: X_COLLABORATOR, y, page });
+        y -= 15;
+    }
+    return items;
+}
+describe("parsePersonCell", () => {
+    it("splits civility, last name and first name", () => {
+        expect(parsePersonCell("M. CHAREF Dahmane")).toEqual({ civilite: "M.", nom: "CHAREF", prenom: "Dahmane" });
+        expect(parsePersonCell("Mme OLIVIER Béatrice")).toEqual({
+            civilite: "Mme",
+            nom: "OLIVIER",
+            prenom: "Béatrice",
+        });
+    });
+    it("handles compound names (multiple uppercase tokens)", () => {
+        expect(parsePersonCell("Mme MAZENOT CHAPPUY Sophie")).toEqual({
+            civilite: "Mme",
+            nom: "MAZENOT CHAPPUY",
+            prenom: "Sophie",
+        });
+        expect(parsePersonCell("M. DI FOLCO Camille")).toEqual({ civilite: "M.", nom: "DI FOLCO", prenom: "Camille" });
+    });
+    it("handles nobiliary particles at the start of the name (de, de la)", () => {
+        expect(parsePersonCell("Mme de CIDRAC Marta")).toEqual({ civilite: "Mme", nom: "de CIDRAC", prenom: "Marta" });
+        expect(parsePersonCell("Mme de LA GONTRIE Marie-Pierre")).toEqual({
+            civilite: "Mme",
+            nom: "de LA GONTRIE",
+            prenom: "Marie-Pierre",
+        });
+        expect(parsePersonCell("M. de LEGGE Dominique")).toEqual({
+            civilite: "M.",
+            nom: "de LEGGE",
+            prenom: "Dominique",
+        });
+        expect(parsePersonCell("Mme APOURCEAU-POLY Cathy")).toEqual({
+            civilite: "Mme",
+            nom: "APOURCEAU-POLY",
+            prenom: "Cathy",
+        });
+    });
+    it("keeps a truncated first name as-is", () => {
+        expect(parsePersonCell("Mme AESCHLIMANN Marie-Do")).toEqual({
+            civilite: "Mme",
+            nom: "AESCHLIMANN",
+            prenom: "Marie-Do",
+        });
+    });
+    it("ignores the (*) unpaid leave marker", () => {
+        expect(parsePersonCell("M. DURAND (*) Paul")).toEqual({ civilite: "M.", nom: "DURAND", prenom: "Paul" });
+    });
+    it("returns null for an empty cell or civility-only", () => {
+        expect(parsePersonCell("")).toBeNull();
+        expect(parsePersonCell("M.")).toBeNull();
+    });
+});
+describe("buildCollaboratorRows", () => {
+    it("attaches multiple collaborators to the current senator (carry-forward when employer is empty)", () => {
+        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 rows = buildCollaboratorRows(items);
+        expect(rows).toHaveLength(4);
+        expect(rows.slice(0, 3).every((r) => r.senateur.nom === "AESCHLIMANN")).toBe(true);
+        expect(rows[3].senateur.nom === "ALLIZARD" && rows[3].collaborateur.nom === "OLIVIER").toBe(true);
+    });
+    it("ignores headers, footers and page numbers, and handles multiple 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 rows = buildCollaboratorRows(items);
+        expect(rows).toHaveLength(2);
+        expect(rows[0].senateur.nom).toBe("BACCI");
+        expect(rows[1].senateur.nom).toBe("BÉLIM");
+    });
+    it("emits nothing until an employer has been encountered", () => {
+        const orphan = [{ str: "M. ORPHELIN Jean", x: X_COLLABORATOR, y: 700, page: 1 }];
+        expect(buildCollaboratorRows(orphan)).toHaveLength(0);
+    });
+});
+describe("extractEditionDate", () => {
+    it("extracts the edition date from the footer", () => {
+        const date = extractEditionDate(["…", "Edition du 24/06/2026", "(*) Congé non rémunéré"]);
+        expect(date?.toISOString().slice(0, 10)).toBe("2026-06-24");
+    });
+    it("returns null if absent", () => {
+        expect(extractEditionDate(["nothing here"])).toBeNull();
+    });
+});
+describe("normalizeForComparison", () => {
+    it("uppercases, removes accents and compacts spaces", () => {
+        expect(normalizeForComparison("  Béatrice   ")).toBe("BEATRICE");
+        expect(normalizeForComparison("Bélim")).toBe("BELIM");
+    });
+});

package/lib/tests/incrementalImportSql.test.js

@@ -33,6 +33,7 @@ describe("incremental import SQL", () => {
         expect(sql).toContain("t.%1$I IS NOT DISTINCT FROM s.%1$I");
         expect(sql).toContain("jsonb_build_array(");
         expect(sql).toContain("Sync strategy for %.%: %");
+        expect(sql).toContain("ALTER TABLE senat.%I REPLICA IDENTITY FULL");
         expect(sql).toContain("Rejected sync key for %.% from % because only %/% columns are present in both staging and target: %");
         expect(sql).toContain("WHERE table_namespace.nspname IN ('dosleg_staging', 'senat')");
         expect(sql).toContain("CASE WHEN table_namespace.nspname = 'dosleg_staging' THEN 0 ELSE 1 END AS schema_priority");
@@ -42,7 +43,9 @@ describe("incremental import SQL", () => {
         expect(sql).toContain("LEFT JOIN target_counts reference_row USING (row_signature)");
         expect(sql).toContain("DELETE FROM senat.%1$I t WHERE NOT EXISTS (SELECT 1 FROM %2$I.%1$I s WHERE %3$s)");
         expect(sql).toContain("UPDATE senat.%1$I t SET %2$s FROM %3$I.%1$I s WHERE %4$s AND (%5$s)");
-        expect(sql).toContain("INSERT INTO senat.%1$I (%2$s) SELECT %3$s FROM %4$I.%1$I s WHERE NOT EXISTS (SELECT 1 FROM senat.%1$I t WHERE %5$s)");
+        expect(sql).toContain("INSERT INTO senat.%1$I (%2$s) '");
+        expect(sql).toContain("SELECT %3$s FROM %4$I.%1$I s '");
+        expect(sql).toContain("(SELECT 1 FROM senat.%1$I t WHERE %5$s)");
         expect(sql).toContain("ALTER TABLE senat.%I ADD CONSTRAINT %I %s");
         expect(sql).toContain("DROP SEQUENCE IF EXISTS senat.%I CASCADE");
         expect(sql).not.toContain("DROP SCHEMA IF EXISTS dosleg_staging CASCADE;");

package/package.json

@@ -1,119 +1,121 @@
-{
-  "name": "@tricoteuses/senat",
-  "version": "3.1.22",
-  "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.2.0",
-    "command-line-args": "^6.0.2",
-    "domhandler": "^6.0.1",
-    "dotenv": "^17.4.2",
-    "fast-xml-parser": "^5.9.3",
-    "fs-extra": "^11.3.6",
-    "jsdom": "^29.1.1",
-    "luxon": "^3.7.2",
-    "node-stream-zip": "^1.15.0",
-    "p-limit": "^7.3.0",
-    "pg": "^8.22.0",
-    "pg-cursor": "^2.21.0",
-    "slug": "^11.0.1",
-    "windows-1252": "^3.0.4",
-    "zod": "^4.4.3"
-  },
-  "devDependencies": {
-    "@eslint/js": "^10.0.1",
-    "@types/command-line-args": "^5.2.3",
-    "@types/fs-extra": "^11.0.4",
-    "@types/jsdom": "^28.0.3",
-    "@types/luxon": "^3.7.2",
-    "@types/node": "^26.1.1",
-    "@types/pg": "^8.20.0",
-    "@types/pg-cursor": "^2.7.2",
-    "@types/slug": "^5.0.9",
-    "@typescript-eslint/eslint-plugin": "^8.63.0",
-    "@typescript-eslint/parser": "^8.63.0",
-    "cross-env": "^10.1.0",
-    "eslint": "^10.6.0",
-    "extract-pg-schema": "^5.8.2",
-    "globals": "^17.7.0",
-    "kanel": "^4.0.2",
-    "kanel-kysely": "^4.0.0",
-    "kanel-zod": "^4.0.0",
-    "kysely": "^0.29.3",
-    "prettier": "^3.9.4",
-    "tsx": "^4.23.0",
-    "typescript": "^6.0.3",
-    "vitest": "^4.1.10"
-  }
-}
+{
+  "name": "@tricoteuses/senat",
+  "version": "3.1.24",
+  "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_collaborateurs": "tsx src/scripts/retrieve_collaborateurs.ts",
+    "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.2.0",
+    "command-line-args": "^6.0.2",
+    "domhandler": "^6.0.1",
+    "dotenv": "^17.4.2",
+    "fast-xml-parser": "^5.9.3",
+    "fs-extra": "^11.3.6",
+    "jsdom": "^29.1.1",
+    "luxon": "^3.7.2",
+    "node-stream-zip": "^1.15.0",
+    "p-limit": "^7.3.0",
+    "pg": "^8.22.0",
+    "pg-cursor": "^2.21.0",
+    "slug": "^11.0.1",
+    "unpdf": "^1.8.0",
+    "windows-1252": "^3.0.4",
+    "zod": "^4.4.3"
+  },
+  "devDependencies": {
+    "@eslint/js": "^10.0.1",
+    "@types/command-line-args": "^5.2.3",
+    "@types/fs-extra": "^11.0.4",
+    "@types/jsdom": "^28.0.3",
+    "@types/luxon": "^3.7.2",
+    "@types/node": "^26.1.1",
+    "@types/pg": "^8.20.0",
+    "@types/pg-cursor": "^2.7.2",
+    "@types/slug": "^5.0.9",
+    "@typescript-eslint/eslint-plugin": "^8.63.0",
+    "@typescript-eslint/parser": "^8.63.0",
+    "cross-env": "^10.1.0",
+    "eslint": "^10.6.0",
+    "extract-pg-schema": "^5.8.2",
+    "globals": "^17.7.0",
+    "kanel": "^4.0.2",
+    "kanel-kysely": "^4.0.0",
+    "kanel-zod": "^4.0.0",
+    "kysely": "^0.29.3",
+    "prettier": "^3.9.4",
+    "tsx": "^4.23.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.10"
+  }
+}

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();

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