@tricoteuses/senat 2.22.4 → 2.22.6

package/lib/src/conversion_textes.js

@@ -70,7 +70,16 @@ export function extractMetadata(xmlDoc) {
     return metadata;
 }
 export async function convertSenatXmlToHtml(texteXml, outputFilePath) {
-    const { document: xmlDoc } = new JSDOM(texteXml, { contentType: "text/xml" }).window;
+    let xmlDoc;
+    try {
+        xmlDoc = new JSDOM(texteXml, { contentType: "text/xml" }).window.document;
+    }
+    catch (err) {
+        if (await fs.pathExists(outputFilePath)) {
+            await fs.remove(outputFilePath);
+        }
+        throw err;
+    }
     const metadata = extractMetadata(xmlDoc);
     const xmlBody = xmlDoc.querySelector("body");
     const style = `

package/lib/src/index.d.ts

@@ -9,5 +9,5 @@ export type { CompteRendu } from "./types/compte_rendu";
 export type { Debat, LecAssDeb } from "./types/debats";
 export type { Ass, Aud, Auteur, DateSeance, DecCoc, DenRap, DocAtt, Ecr, EtaLoi, LecAss, LecAssRap, Lecture, Loi, Org, OriTxt, Qua, Rap, RapOrg, Scr, Texte, TypAtt, TypLec, TypLoi, TypTxt, TypUrl, } from "./types/dosleg";
 export type { Photo, Sen } from "./types/sens";
-export { UNDEFINED_SESSION, type Session, getSessionsFromStart } from "./types/sessions";
+export { sessionOptions, sessionOptionsOrAll, UNDEFINED_SESSION, type Session, type SessionOrAll, getSessionsFromStart, } from "./types/sessions";
 export type { Alinea, Article, Division, DivisionTag, FlatTexte } from "./types/texte";

package/lib/src/index.js

@@ -1 +1 @@
-export { UNDEFINED_SESSION, getSessionsFromStart } from "./types/sessions";
+export { sessionOptions, sessionOptionsOrAll, UNDEFINED_SESSION, getSessionsFromStart, } from "./types/sessions";

package/lib/src/loaders.d.ts

@@ -14,6 +14,7 @@ export declare const AGENDA_FOLDER = "agenda";
 export declare const COMPTES_RENDUS_FOLDER = "seances";
 export declare const COMMISSION_FOLDER = "commissions";
 export declare const DOSLEG_DOSSIERS_FOLDER = "dossiers";
+export declare const ENRICHED_TEXTE_FOLDER = "leg_enrichi";
 export declare const SCRUTINS_FOLDER = "scrutins";
 export declare const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
 export declare const SENS_ORGANISMES_FOLDER = "organismes";

package/lib/src/loaders.js

@@ -9,6 +9,7 @@ export const AGENDA_FOLDER = "agenda";
 export const COMPTES_RENDUS_FOLDER = "seances";
 export const COMMISSION_FOLDER = "commissions";
 export const DOSLEG_DOSSIERS_FOLDER = "dossiers";
+export const ENRICHED_TEXTE_FOLDER = "leg_enrichi";
 export const SCRUTINS_FOLDER = "scrutins";
 export const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
 export const SENS_ORGANISMES_FOLDER = "organismes";

package/lib/src/model/ameli.d.ts

@@ -11,6 +11,8 @@ declare const findAllAmendementsQuery: import("kysely").SelectQueryBuilder<{
     etat: string;
     sort: any;
     url: string;
+    au_nom_de_commission: string;
+    code_commission: string;
     auteur_est_gouvernement: boolean;
     scrutin_num: any;
     auteurs: {
@@ -33,6 +35,8 @@ export declare function findAllAmendements(fromSession?: number): AsyncIterableI
     etat: string;
     sort: any;
     url: string;
+    au_nom_de_commission: string;
+    code_commission: string;
     auteur_est_gouvernement: boolean;
     scrutin_num: any;
     auteurs: {

package/lib/src/model/ameli.js

@@ -1,7 +1,7 @@
 import { sql } from "kysely";
 import { jsonArrayFrom } from "kysely/helpers/postgres";
 import { dbSenat } from "../databases";
-import { concat, toDateString } from "./util";
+import { concat, rtrim, toDateString } from "./util";
 function auteurs(amendementId) {
     return jsonArrayFrom(dbSenat
         .selectFrom("ameli.amdsen")
@@ -134,8 +134,8 @@ const findAllAmendementsQuery = dbSenat
         .else(val("https://www.senat.fr/amendements/"))
         .end(), ref("ameli.ses.ann"), val("-"), sql `(ameli.ses.ann + 1)`, val("/"), ref("ameli.txt_ameli.numabs"), val("/Amdt_"), ref("ameli.amd.num"), val(".html")).as("url"),
     "ameli.grppol_ameli.lilcou as au_nom_de_groupe_politique",
-    "ameli.com_ameli.lil as au_nom_de_commission",
-    "ameli.com_ameli.cod as code_commission",
+    rtrim(ref("ameli.com_ameli.lil")).as("au_nom_de_commission"),
+    rtrim(ref("ameli.com_ameli.cod")).as("code_commission"),
     eb.case().when("ameli.cab.entid", "is not", null).then(true).else(false).end().as("auteur_est_gouvernement"),
     scrutin(ref("ameli.amd.num"), ref("ameli.ses.ann"), ref("dosleg.texte.lecassidt")),
     auteurs(ref("ameli.amd.id")).as("auteurs"),

package/lib/src/parsers/texte.js

@@ -62,7 +62,7 @@ function buildEmptyArticle(index) {
         alineas: [],
     };
 }
-function flattenTexte(texteContentRoot) {
+function splitTexte(texteContentRoot) {
     const divisions = [];
     let divisionIndex = 0;
     const iter = (node) => {
@@ -129,7 +129,7 @@ export function transformTexte(document) {
         date_depot: dateDepot ? new Date(dateDepot) : null,
         date_publication_xml: datePublicationXml ? new Date(datePublicationXml) : null,
         version: identificationParts?.["version"] ? identificationParts["version"] : null,
-        divisions: bodyElement ? flattenTexte(bodyElement) : [],
+        divisions: bodyElement ? splitTexte(bodyElement) : [],
     };
 }
 export function transformExposeDesMotifs(document) {

package/lib/src/scripts/convert_data.js

@@ -5,7 +5,7 @@ import path from "path";
 import pLimit from "p-limit";
 import * as git from "../git";
 import { datasets, EnabledDatasets, getEnabledDatasets } from "../datasets";
-import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, DOCUMENT_METADATA_FILE, DOSLEG_DOSSIERS_FOLDER, SCRUTINS_FOLDER, RAPPORT_FOLDER, SENS_CIRCONSCRIPTIONS_FOLDER, SENS_ORGANISMES_FOLDER, SENS_SENATEURS_FOLDER, TEXTE_FOLDER, } from "../loaders";
+import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, DOCUMENT_METADATA_FILE, DOSLEG_DOSSIERS_FOLDER, SCRUTINS_FOLDER, RAPPORT_FOLDER, SENS_CIRCONSCRIPTIONS_FOLDER, SENS_ORGANISMES_FOLDER, SENS_SENATEURS_FOLDER, TEXTE_FOLDER, ENRICHED_TEXTE_FOLDER, } from "../loaders";
 import { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllDossiers, findAllScrutins, findAllOrganismes, findAllQuestions, findAllSens, findAllTextes, findAllRapports, } from "../model";
 import { processRapport, processTexte } from "./retrieve_documents";
 import { buildActesLegislatifs } from "../model/dosleg";
@@ -40,7 +40,7 @@ async function convertData() {
             commitAndPushGit(ameliDir, options);
         }
         catch (error) {
-            console.error(`Error converting Ameli dataset:`, error);
+            console.error("Error converting Ameli dataset:", error);
         }
     }
     if (enabledDatasets & EnabledDatasets.Debats) {
@@ -50,7 +50,7 @@ async function convertData() {
             commitAndPushGit(debatsDir, options);
         }
         catch (error) {
-            console.error(`Error converting Debats dataset:`, error);
+            console.error("Error converting Debats dataset:", error);
         }
     }
     if (enabledDatasets & EnabledDatasets.DosLeg) {
@@ -60,7 +60,7 @@ async function convertData() {
             commitAndPushGit(doslegDir, options);
         }
         catch (error) {
-            console.error(`Error converting DosLeg dataset:`, error);
+            console.error("Error converting DosLeg dataset:", error);
         }
         try {
             await convertDatasetScrutins(dataDir, options);
@@ -68,7 +68,7 @@ async function convertData() {
             commitAndPushGit(scrutinsDir, options);
         }
         catch (error) {
-            console.error(`Error converting Scrutins dataset:`, error);
+            console.error("Error converting Scrutins dataset:", error);
         }
     }
     if (enabledDatasets & EnabledDatasets.Questions) {
@@ -78,7 +78,7 @@ async function convertData() {
             commitAndPushGit(questionsDir, options);
         }
         catch (error) {
-            console.error(`Error converting Questions dataset:`, error);
+            console.error("Error converting Questions dataset:", error);
         }
     }
     if (enabledDatasets & EnabledDatasets.Sens) {
@@ -88,7 +88,7 @@ async function convertData() {
             commitAndPushGit(sensDir, options);
         }
         catch (error) {
-            console.error(`Error converting Sens dataset:`, error);
+            console.error("Error converting Sens dataset:", error);
         }
     }
     if (!options["silent"]) {
@@ -220,8 +220,9 @@ async function convertDatasetQuestions(dataDir, options) {
 async function convertTextes(dataDir, options) {
     const originalTextesDir = path.join(dataDir, TEXTE_FOLDER, DATA_ORIGINAL_FOLDER);
     const transformedTextesDir = path.join(dataDir, TEXTE_FOLDER, DATA_TRANSFORMED_FOLDER);
+    const enrichedTextesDir = path.join(dataDir, ENRICHED_TEXTE_FOLDER);
     if (!options["silent"]) {
-        console.log(`Converting database textes data into files…`);
+        console.log("Converting database textes data into files…");
     }
     for await (const texte of findAllTextes()) {
         const session = texte["session"] ?? UNDEFINED_SESSION;
@@ -253,14 +254,14 @@ async function convertTextes(dataDir, options) {
             spaces: 2,
         });
         if (options.fetchDocuments) {
-            await processTexte(metadata, originalTextesDir, transformedTextesDir, options);
+            await processTexte(metadata, originalTextesDir, transformedTextesDir, enrichedTextesDir, options);
         }
     }
 }
 async function convertRapports(dataDir, options) {
     const originalRapportsDir = path.join(dataDir, RAPPORT_FOLDER, DATA_ORIGINAL_FOLDER);
     if (!options["silent"]) {
-        console.log(`Converting database rapports data into files…`);
+        console.log("Converting database rapports data into files…");
     }
     for await (const rapport of findAllRapports()) {
         const session = rapport["session"] ?? UNDEFINED_SESSION;

package/lib/src/scripts/retrieve_documents.d.ts

@@ -1,3 +1,3 @@
 import { DocumentMetadata } from "../types/texte";
-export declare function processTexte(texteMetadata: DocumentMetadata, originalTextesDir: string, transformedTextesDir: string, options: any): Promise<void>;
+export declare function processTexte(texteMetadata: DocumentMetadata, originalTextesDir: string, transformedTextesDir: string, enrichedTextesDir: string, options: any): Promise<void>;
 export declare function processRapport(rapportMetadata: any, originalRapportsDir: string, options: any): Promise<void>;

package/lib/src/scripts/retrieve_documents.js

@@ -3,8 +3,9 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import { DateTime } from "luxon";
 import path from "path";
+import { convertSenatXmlToHtml } from "../conversion_textes";
 import * as git from "../git";
-import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, iterLoadSenatRapportUrls, iterLoadSenatTexteUrls, RAPPORT_FOLDER, TEXTE_FOLDER, } from "../loaders";
+import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, ENRICHED_TEXTE_FOLDER, iterLoadSenatRapportUrls, iterLoadSenatTexteUrls, RAPPORT_FOLDER, TEXTE_FOLDER, } from "../loaders";
 import { parseExposeDesMotifs, parseTexte, parseTexteFromFile } from "../parsers/texte";
 import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions";
 import { commonOptions } from "./shared/cli_helpers";
@@ -98,7 +99,7 @@ async function processDocument(url, destPath, docDate, options) {
     await fs.outputFile(destPath, buffer);
     return { success: true, skipped: false, buffer };
 }
-export async function processTexte(texteMetadata, originalTextesDir, transformedTextesDir, options) {
+export async function processTexte(texteMetadata, originalTextesDir, transformedTextesDir, enrichedTextesDir, options) {
     const texteDir = path.join(originalTextesDir, `${texteMetadata.session ?? UNDEFINED_SESSION}`, texteMetadata.name);
     let exposeDesMotifsContent = null;
     if (texteMetadata.url_expose_des_motifs) {
@@ -121,19 +122,30 @@ export async function processTexte(texteMetadata, originalTextesDir, transformed
     for (const format of formats) {
         if (!isOptionEmptyOrHasValue(options.formats, format.type))
             continue;
-        if (!format.url)
+        if (format.url === undefined || format.url.toString().includes("#"))
             continue;
         const destPath = path.join(texteDir, `${texteMetadata.name}.${format.type}`);
         const result = await processDocument(format.url.toString(), destPath, texteMetadata.date, options);
         // Specific logic: Parsing (Only applies to XML)
         if (format.isParseTarget && options.parseDocuments) {
-            if (!result.buffer && !(await fs.pathExists(destPath))) {
-                if (options.verbose) {
-                    console.warn(`Skipping parse for missing XML file: ${destPath}`);
+            if (result.buffer !== null || (await fs.pathExists(destPath))) {
+                await parseDocument(texteMetadata.session, transformedTextesDir, destPath, texteMetadata.name, result.buffer, exposeDesMotifsContent, options);
+            }
+            let texteXmlContent = null;
+            if (result.buffer === null && (await fs.pathExists(destPath))) {
+                texteXmlContent = await fs.readFile(destPath, "utf-8");
+            }
+            else if (result.buffer !== null) {
+                texteXmlContent = textDecoder.decode(result.buffer);
+            }
+            if (texteXmlContent !== null) {
+                try {
+                    await convertSenatXmlToHtml(texteXmlContent, path.join(enrichedTextesDir, `${texteMetadata.session ?? UNDEFINED_SESSION}`, texteMetadata.name, `${texteMetadata.name}.html`));
+                }
+                catch (error) {
+                    console.error(`Error converting ${texteMetadata.name} to HTML: ${error.message}`);
                 }
-                continue;
             }
-            await parseDocument(texteMetadata.session, transformedTextesDir, destPath, texteMetadata.name, result.buffer, exposeDesMotifsContent, options);
         }
     }
 }
@@ -154,8 +166,10 @@ async function processTextes(dataDir, sessions) {
     const textesDir = path.join(dataDir, TEXTE_FOLDER);
     const originalTextesDir = path.join(textesDir, DATA_ORIGINAL_FOLDER);
     const transformedTextesDir = path.join(textesDir, DATA_TRANSFORMED_FOLDER);
-    if (options["parseDocuments"]) {
+    const enrichedTextesDir = path.join(dataDir, ENRICHED_TEXTE_FOLDER);
+    if (options["parseDocuments"] && options["only-recent"] === undefined) {
         ensureAndClearDir(transformedTextesDir);
+        ensureAndClearDir(enrichedTextesDir);
     }
     const dlOptions = {
         force: options["force"],
@@ -167,10 +181,11 @@ async function processTextes(dataDir, sessions) {
     };
     for (const session of sessions) {
         for (const { item: texteMetadata } of iterLoadSenatTexteUrls(dataDir, session)) {
-            await processTexte(texteMetadata, originalTextesDir, transformedTextesDir, dlOptions);
+            await processTexte(texteMetadata, originalTextesDir, transformedTextesDir, enrichedTextesDir, dlOptions);
         }
     }
     commitAndPushGit(textesDir);
+    commitAndPushGit(enrichedTextesDir);
 }
 async function processRapports(dataDir, sessions) {
     const rapportsDir = path.join(dataDir, RAPPORT_FOLDER);

package/lib/src/scripts/retrieve_open_data.js

@@ -297,7 +297,7 @@ async function retrieveOpenData() {
     if (options["schema"]) {
         const dbConnectionString = `postgres://${process.env["PGUSER"]}:${process.env["PGPASSWORD"]}@${process.env["PGHOST"]}:${process.env["PGPORT"]}/senat`;
         const definitionsDir = path.resolve("src", "raw_types");
-        const definitionFilePath = path.join(definitionsDir, `senat.ts`);
+        const definitionFilePath = path.join(definitionsDir, "senat.ts");
         execSync(`npx kysely-codegen --url '${dbConnectionString}' --out-file ${definitionFilePath}`, {
             env: process.env,
             encoding: "utf-8",

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

@@ -1,5 +1,6 @@
 export declare const UNDEFINED_SESSION = 0;
-declare const sessions: readonly [0, 1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026];
-export type Session = (typeof sessions)[number];
-export declare function getSessionsFromStart(startSession: Session): (0 | 1958 | 1959 | 1960 | 1961 | 1962 | 1963 | 1964 | 1965 | 1966 | 1967 | 1968 | 1969 | 1970 | 1971 | 1972 | 1973 | 1974 | 1975 | 1976 | 1977 | 1978 | 1979 | 1980 | 1981 | 1982 | 1983 | 1984 | 1985 | 1986 | 1987 | 1988 | 1989 | 1990 | 1991 | 1992 | 1993 | 1994 | 1995 | 1996 | 1997 | 1998 | 1999 | 2000 | 2001 | 2002 | 2003 | 2004 | 2005 | 2006 | 2007 | 2008 | 2009 | 2010 | 2011 | 2012 | 2013 | 2014 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024 | 2025 | 2026)[];
-export {};
+export declare const sessionOptions: readonly [1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026];
+export declare const sessionOptionsOrAll: readonly [0, 1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026];
+export type Session = (typeof sessionOptions)[number];
+export type SessionOrAll = (typeof sessionOptionsOrAll)[number];
+export declare function getSessionsFromStart(startSession: SessionOrAll): (1958 | 1959 | 1960 | 1961 | 1962 | 1963 | 1964 | 1965 | 1966 | 1967 | 1968 | 1969 | 1970 | 1971 | 1972 | 1973 | 1974 | 1975 | 1976 | 1977 | 1978 | 1979 | 1980 | 1981 | 1982 | 1983 | 1984 | 1985 | 1986 | 1987 | 1988 | 1989 | 1990 | 1991 | 1992 | 1993 | 1994 | 1995 | 1996 | 1997 | 1998 | 1999 | 2000 | 2001 | 2002 | 2003 | 2004 | 2005 | 2006 | 2007 | 2008 | 2009 | 2010 | 2011 | 2012 | 2013 | 2014 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024 | 2025 | 2026)[];

package/lib/src/types/sessions.js

@@ -1,84 +1,19 @@
 export const UNDEFINED_SESSION = 0;
-const sessions = [
-    UNDEFINED_SESSION,
-    1958,
-    1959,
-    1960,
-    1961,
-    1962,
-    1963,
-    1964,
-    1965,
-    1966,
-    1967,
-    1968,
-    1969,
-    1970,
-    1971,
-    1972,
-    1973,
-    1974,
-    1975,
-    1976,
-    1977,
-    1978,
-    1979,
-    1980,
-    1981,
-    1982,
-    1983,
-    1984,
-    1985,
-    1986,
-    1987,
-    1988,
-    1989,
-    1990,
-    1991,
-    1992,
-    1993,
-    1994,
-    1995,
-    1996,
-    1997,
-    1998,
-    1999,
-    2000,
-    2001,
-    2002,
-    2003,
-    2004,
-    2005,
-    2006,
-    2007,
-    2008,
-    2009,
-    2010,
-    2011,
-    2012,
-    2013,
-    2014,
-    2015,
-    2016,
-    2017,
-    2018,
-    2019,
-    2020,
-    2021,
-    2022,
-    2023,
-    2024,
-    2025,
-    2026,
+export const sessionOptions = [
+    1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1976,
+    1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+    1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+    2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026,
     // TO COMPLETE EVERY YEAR :)
 ];
+export const sessionOptionsOrAll = [UNDEFINED_SESSION, ...sessionOptions];
 export function getSessionsFromStart(startSession) {
-    if (startSession === 0) {
-        return Array.from(sessions);
+    if (startSession === UNDEFINED_SESSION) {
+        return Array.from(sessionOptions);
     }
-    const sessionIndex = sessions.findIndex((session) => startSession === session);
+    const sessionIndex = sessionOptions.findIndex((session) => startSession === session);
     if (sessionIndex >= 0) {
-        return sessions.slice(sessionIndex);
+        return sessionOptions.slice(sessionIndex);
     }
     return [];
 }

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

@@ -63,6 +63,8 @@ export interface Alinea extends DivisionContent {
     eId: string;
     heading: DivisionContent;
     pastille: string | null;
+    text_avec_liens?: string | null;
+    html_avec_liens?: string | null;
 }
 export interface ExposeDesMotifs {
     text: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.22.4",
+  "version": "2.22.6",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",
@@ -83,9 +83,8 @@
     "pg-cursor": "^2.12.1",
     "slug": "^11.0.0",
     "tsx": "^4.21.0",
-    "zod": "^4.3.5",
-    "vitest": "^4.0.18",
-    "windows-1252": "^3.0.4"
+    "windows-1252": "^3.0.4",
+    "zod": "^4.3.5"
   },
   "devDependencies": {
     "@typed-code/schemats": "^5.0.1",
@@ -106,6 +105,7 @@
     "kysely-codegen": "^0.19.0",
     "prettier": "^3.5.3",
     "tslib": "^2.1.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
   }
 }