@tricoteuses/senat 3.1.5 → 3.1.6

package/lib/src/rich_types/sens.d.ts

@@ -68,7 +68,7 @@ export interface SenateurResult {
     fonctions_bureau: FonctionRow[];
     groupe_politique: string | null;
     groupes: MandatOrganismeRow[];
-    groupes_amitie: MandatOrganismeRow[];
+    groupes_senatoriaux: MandatOrganismeRow[];
     mandats_senateur: MandatSenateurRow[];
     matricule: string;
     nom_usuel: string | null;

package/lib/src/server/sens.js

@@ -230,7 +230,7 @@ export async function* findAll() {
                 .orderBy("fonmemgrpsen.fonmemgrpsendatdeb", (ob) => ob.desc().nullsLast())).as("fonctions"),
         ])
             .whereRef("memgrpsen.senmat", "=", "sen.senmat")
-            .orderBy("memgrpsen.memgrpsendatent", (ob) => ob.desc().nullsLast())).as("groupes_amitie"),
+            .orderBy("memgrpsen.memgrpsendatent", (ob) => ob.desc().nullsLast())).as("groupes_senatoriaux"),
         // Fonctions au bureau du Sénat
         jsonArrayFrom(eb
             .withSchema("senat")
@@ -294,7 +294,7 @@ export async function* findAll() {
             delegations: row.delegations ?? [],
             fonctions_bureau: row.fonctions_bureau ?? [],
             groupes: row.groupes ?? [],
-            groupes_amitie: row.groupes_amitie ?? [],
+            groupes_senatoriaux: row.groupes_senatoriaux ?? [],
             mandats_senateur: row.mandats_senateur ?? [],
             organismes: row.organismes ?? [],
             points_contact: row.points_contact ?? [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",

package/lib/src/config.d.ts

@@ -1,43 +0,0 @@
-import "dotenv/config";
-import { z } from "zod";
-export declare const dbSchema: z.ZodObject<{
-    host: z.ZodString;
-    name: z.ZodString;
-    password: z.ZodString;
-    port: z.ZodCoercedNumber<unknown>;
-    user: z.ZodString;
-}, z.core.$strip>;
-export type DbConfig = z.infer<typeof dbSchema>;
-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>;
-    stagingDb: 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;
-    };
-    stagingDb: {
-        host: string;
-        name: string;
-        password: string;
-        port: number;
-        user: string;
-    };
-};
-export default _default;

package/lib/src/config.js

@@ -1,37 +0,0 @@
-import "dotenv/config";
-import { z } from "zod";
-export 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,
-    stagingDb: dbSchema,
-});
-const config = {
-    db: {
-        host: process.env["DB_HOST"] || "localhost",
-        name: process.env["DB_NAME"] || "senat",
-        password: process.env["DB_PASSWORD"] || "opendata",
-        port: process.env["DB_PORT"] || 5432,
-        user: process.env["DB_USER"] || "opendata",
-    },
-    stagingDb: {
-        host: process.env["STAGING_DB_HOST"] || process.env["DB_HOST"] || "localhost",
-        name: process.env["STAGING_DB_NAME"] || "senat_staging",
-        password: process.env["STAGING_DB_PASSWORD"] || process.env["DB_PASSWORD"] || "opendata",
-        port: process.env["STAGING_DB_PORT"] || process.env["DB_PORT"] || 5432,
-        user: process.env["STAGING_DB_USER"] || process.env["DB_USER"] || "opendata",
-    },
-};
-const result = configSchema.safeParse(config);
-if (!result.success) {
-    const issues = JSON.stringify(result.error.issues, null, 2);
-    const serializedConfig = JSON.stringify(config, null, 2);
-    console.error(`Error in configuration:\n${serializedConfig}\nError:\n${issues}`);
-    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>;

package/lib/src/conversion_textes.js

@@ -1,320 +0,0 @@
-import { JSDOM } from "jsdom";
-import fs from "fs-extra";
-import path from "path";
-import { DateTime } from "luxon";
-export function extractMetadata(xmlDoc) {
-    const metadata = {
-        number: null,
-        session: null,
-        date: null,
-        type: null,
-        authors: null,
-        title: xmlDoc.querySelector("docTitle")?.textContent?.trim() || null,
-        commission: null,
-    };
-    // Extract Number
-    const docIdAlias = xmlDoc.querySelector('FRBRalias[name="signet-dossier-legislatif-senat"]');
-    if (docIdAlias) {
-        const value = docIdAlias.getAttribute("value");
-        if (value) {
-            const match = value.match(/\d+$/);
-            if (match)
-                metadata.number = match[0];
-        }
-    }
-    // Extract Session
-    const sessionUri = xmlDoc.querySelector("FRBRExpression > FRBRuri")?.getAttribute("value");
-    if (sessionUri) {
-        const match = sessionUri.match(/\d{4}-\d{4}/);
-        if (match)
-            metadata.session = match[0];
-    }
-    // Extract Date
-    const depotDate = xmlDoc.querySelector('FRBRdate[name="#depot"]')?.getAttribute("date");
-    if (depotDate) {
-        metadata.date = DateTime.fromISO(depotDate).setLocale("fr").toFormat("d MMMM yyyy");
-    }
-    else {
-        const presentationDate = xmlDoc.querySelector('FRBRdate[name="#presentation"]')?.getAttribute("date");
-        if (presentationDate) {
-            metadata.date = DateTime.fromISO(presentationDate).setLocale("fr").toFormat("d MMMM yyyy");
-        }
-    }
-    // Extract Type
-    const bill = xmlDoc.querySelector("bill");
-    const typeCode = bill?.getAttribute("name");
-    if (typeCode === "ppl") {
-        metadata.type = "PROPOSITION DE LOI";
-    }
-    else if (typeCode === "pjl") {
-        metadata.type = "PROJET DE LOI";
-    }
-    // Extract Authors
-    const authorRef = xmlDoc.querySelector('FRBRWork > FRBRauthor[as="#auteur"]')?.getAttribute("href");
-    if (authorRef) {
-        const authorId = authorRef.replace(/^#/, "");
-        const authorPerson = xmlDoc.querySelector(`TLCPerson[eId="${authorId}"]`);
-        if (authorPerson) {
-            const showAs = authorPerson.getAttribute("showAs");
-            if (showAs) {
-                metadata.authors = showAs.replace(/, Sénateurs$/, ", Sénateurs et Sénatrices");
-            }
-        }
-    }
-    // Extract Commission
-    const commissionNode = xmlDoc.querySelector('TLCOrganization[eId="commission-senat"]') ||
-        xmlDoc.querySelector('TLCOrganization[eId^="commission-"]:not([eId*="assemblee"])');
-    if (commissionNode) {
-        metadata.commission = commissionNode.getAttribute("showAs");
-    }
-    return metadata;
-}
-export async function convertSenatXmlToHtml(texteXml, outputFilePath) {
-    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 = `
-body {
-  font-family: "URW Bookman", "Bookman Old Style", serif;
-  max-width: 800px;
-  margin: 40px auto;
-  line-height: 1.5;
-  color: #333;
-}
-.header {
-  text-align: center;
-  margin-bottom: 40px;
-  border-bottom: 2px solid #333;
-  padding-bottom: 20px;
-}
-.header-top {
-  font-weight: bold;
-  font-size: 1.2em;
-  margin-bottom: 10px;
-}
-.header-session {
-  text-transform: uppercase;
-  font-size: 0.9em;
-  margin-bottom: 5px;
-}
-.header-date {
-  font-size: 0.9em;
-  margin-bottom: 5px;
-}
-.header-number {
-  font-weight: bold;
-  font-size: 1.1em;
-  margin-bottom: 20px;
-}
-.header-type {
-  font-weight: bold;
-  font-size: 1.5em;
-  margin-top: 20px;
-}
-.header-authors {
-  margin-top: 20px;
-  font-style: italic;
-}
-.header-commission {
-  margin-top: 15px;
-  font-size: 0.9em;
-}
-h1 {
-  text-align: center;
-  font-size: 1.8em;
-  margin-top: 10px;
-}
-p {
-  margin: 0.6em 0;
-}
-p.has-alinea {
-  position: relative;
-  padding-left: 2.5em;
-}
-.alinea {
-  position: absolute;
-  left: 0;
-  top: 0.15em;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 1.5em;
-  height: 1.5em;
-  padding: 0 0.3em;
-  margin-right: 0.3em;
-  font-size: 0.75em;
-  font-weight: bold;
-  color: #555;
-  background-color: #f0f0f0;
-  border: 1px solid #ccc;
-  border-radius: 1em;
-}
-.num {
-  font-weight: bold;
-  margin-right: 0.2em;
-}
-.article {
-  margin-top: 2em;
-}
-.article h3 {
-  border-bottom: 1px solid #eee;
-  padding-bottom: 5px;
-}
-`;
-    const htmlDocTemplate = `<!DOCTYPE html>
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>${metadata.title || "Document Sénat"}</title>
-  <style>${style}</style>
-</head>
-<body>
-  <div class="header">
-    <div class="header-top">SÉNAT</div>
-    <div class="header-session">SESSION ORDINAIRE DE ${metadata.session || "...."}</div>
-    ${metadata.date ? `<div class="header-date">Enregistré à la Présidence du Sénat le ${metadata.date}</div>` : ""}
-    <div class="header-number">N° ${metadata.number || "...."}</div>
-    <div class="header-type">${metadata.type || ""}</div>
-    <div class="header-authors">${metadata.authors || ""}</div>
-    ${metadata.commission
-        ? [
-            `<div class="header-commission">Envoyée à la ${metadata.commission.toLowerCase()},`,
-            "sous réserve de la constitution éventuelle d'une commission spéciale dans les conditions prévues",
-            "par le Règlement.</div>",
-        ].join(" ")
-        : ""}
-  </div>
-  <h1>${metadata.title || ""}</h1>
-</body>
-</html>`;
-    const { document: htmlDoc } = new JSDOM(htmlDocTemplate).window;
-    const body = htmlDoc.body;
-    if (xmlBody) {
-        const processNode = (xmlNode, htmlParent, alineaData = null) => {
-            const children = Array.from(xmlNode.childNodes);
-            const alineaChildren = [];
-            const otherChildren = [];
-            for (const child of children) {
-                if (child.nodeType === 1 && child.tagName.toLowerCase() === "alinea") {
-                    alineaChildren.push(child);
-                }
-                else {
-                    otherChildren.push(child);
-                }
-            }
-            for (const child of otherChildren) {
-                if (child.nodeType === 3) {
-                    htmlParent.appendChild(htmlDoc.createTextNode(child.textContent || ""));
-                }
-                else if (child.nodeType === 1) {
-                    const element = child;
-                    const tagName = element.tagName.toLowerCase();
-                    let htmlElement = null;
-                    switch (tagName) {
-                        case "article": {
-                            htmlElement = htmlDoc.createElement("div");
-                            htmlElement.className = "article";
-                            const artId = element.getAttribute("eId");
-                            if (artId)
-                                htmlElement.id = artId;
-                            const artGuid = element.getAttribute("GUID");
-                            if (artGuid)
-                                htmlElement.setAttribute("data-guid", artGuid);
-                            break;
-                        }
-                        case "num": {
-                            const parentTagName = element.parentElement?.tagName.toLowerCase();
-                            if (parentTagName === "alinea" && alineaData) {
-                                alineaData.numText = element.textContent?.trim();
-                                continue;
-                            }
-                            htmlElement = htmlDoc.createElement("span");
-                            htmlElement.className = "num";
-                            break;
-                        }
-                        case "heading":
-                            htmlElement = htmlDoc.createElement("h4");
-                            break;
-                        case "p":
-                            htmlElement = htmlDoc.createElement("p");
-                            if (alineaData) {
-                                htmlElement.classList.add("has-alinea");
-                                if (alineaData.id)
-                                    htmlElement.id = alineaData.id;
-                                if (alineaData.guid)
-                                    htmlElement.setAttribute("data-guid", alineaData.guid);
-                                const pastille = alineaData.pastille;
-                                if (pastille) {
-                                    htmlElement.setAttribute("data-pastille", pastille);
-                                    if (!alineaData.pastilleApplied) {
-                                        const span = htmlDoc.createElement("span");
-                                        span.className = "alinea";
-                                        span.setAttribute("data-alinea", pastille);
-                                        span.textContent = pastille;
-                                        htmlElement.appendChild(span);
-                                        alineaData.pastilleApplied = true;
-                                    }
-                                }
-                                if (alineaData.numText) {
-                                    const xmlPText = element.textContent || "";
-                                    const normalize = (s) => s.replace(/[\\s\\u00A0]+/g, " ").trim();
-                                    const normalizedNum = normalize(alineaData.numText);
-                                    const normalizedP = normalize(xmlPText);
-                                    if (normalizedNum && !normalizedP.startsWith(normalizedNum)) {
-                                        const numSpan = htmlDoc.createElement("span");
-                                        numSpan.className = "num";
-                                        numSpan.textContent = alineaData.numText + " ";
-                                        htmlElement.appendChild(numSpan);
-                                    }
-                                    alineaData.numText = null;
-                                }
-                            }
-                            break;
-                        case "content":
-                            processNode(element, htmlParent, alineaData);
-                            continue;
-                        case "doctitle":
-                            continue;
-                        case "i":
-                        case "b":
-                        case "u":
-                        case "sup":
-                        case "sub":
-                            htmlElement = htmlDoc.createElement(tagName);
-                            break;
-                        default:
-                            htmlElement = htmlDoc.createElement("span");
-                            htmlElement.setAttribute("data-xml-tag", tagName);
-                            break;
-                    }
-                    if (htmlElement) {
-                        htmlParent.appendChild(htmlElement);
-                        processNode(element, htmlElement, alineaData);
-                    }
-                }
-            }
-            for (const element of alineaChildren) {
-                const nextAlineaData = {
-                    id: element.getAttribute("eId"),
-                    guid: element.getAttribute("GUID"),
-                    pastille: element.getAttribute("data:pastille"),
-                    pastilleApplied: false,
-                };
-                processNode(element, htmlParent, nextAlineaData);
-            }
-        };
-        processNode(xmlBody, body);
-    }
-    const htmlContent = "<!DOCTYPE html>\n" + htmlDoc.documentElement.outerHTML;
-    await fs.ensureDir(path.dirname(outputFilePath));
-    await fs.outputFile(outputFilePath, htmlContent);
-}

package/lib/src/databases_postgres.d.ts

@@ -1,4 +0,0 @@
-import postgres from "postgres";
-export type SqlValue = postgres.ParameterOrJSON<never>;
-export declare const sql: postgres.Sql<{}>;
-export declare function streamUnsafeQuery<T>(query: string, params?: readonly unknown[], batchSize?: number): AsyncGenerator<T, void, unknown>;

package/lib/src/databases_postgres.js

@@ -1,23 +0,0 @@
-import postgres from "postgres";
-import config from "./config.js";
-export const sql = postgres({
-    database: config.db.name,
-    host: config.db.host,
-    password: config.db.password,
-    port: config.db.port,
-    transform: {
-        undefined: null,
-    },
-    user: config.db.user,
-});
-function toSqlValue(value) {
-    return value;
-}
-export async function* streamUnsafeQuery(query, params = [], batchSize = 100) {
-    const values = params.map(toSqlValue);
-    for await (const rows of sql.unsafe(query, values).cursor(batchSize)) {
-        for (const row of rows) {
-            yield row;
-        }
-    }
-}

package/lib/src/datasets.d.ts

@@ -1,38 +0,0 @@
-export interface Dataset {
-    database: string;
-    repairEncoding: boolean;
-    repairZip?: (dataset: Dataset, dataDir: string) => void;
-    title: string;
-    url: string;
-    indexes?: {
-        [table: string]: Array<{
-            name: string;
-            columns: string[];
-        }>;
-    };
-    mergeKeys?: {
-        [table: string]: string[];
-    };
-    rowMultisetMergeTables?: string[];
-}
-export interface Datasets {
-    ameli: Dataset;
-    debats: Dataset;
-    dosleg: Dataset;
-    questions: Dataset;
-    sens: Dataset;
-}
-export declare enum EnabledDatasets {
-    None = 0,
-    Ameli = 1,
-    Debats = 2,
-    DosLeg = 4,
-    Questions = 8,
-    Sens = 16,
-    PhotosSenateurs = 32,
-    Agenda = 64,
-    All = 127
-}
-export declare const datasets: Datasets;
-export declare function getEnabledDatasets(categories: string[]): EnabledDatasets;
-export declare function getChosenDatasets(enabledDatasets: EnabledDatasets): Dataset[];