@tricoteuses/senat 3.2.0 → 3.2.2

package/lib/src/raw_types_schemats/sens.js

@@ -0,0 +1,2 @@
+/* tslint:disable */
+export {};

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

@@ -11,6 +11,14 @@ export interface AmendementAuteurRow {
     qualite: string | null;
     rang: string | null;
 }
+export interface LigneCreditPlf {
+    autorisation_engagement: string | null;
+    credit_paiement: string | null;
+    libelle: string;
+}
+export interface ProgrammePlf extends LigneCreditPlf {
+    lignes_credits?: LigneCreditPlf[];
+}
 export interface AmendementResult {
     accepte_gouvernement: string | null;
     alinea: number | null;
@@ -32,6 +40,9 @@ export interface AmendementResult {
     intitule_texte: string | null;
     lecture: string | null;
     motion_libelle: string | null;
+    mission_plf_id: number | null;
+    mission_plf_libelle: string | null;
+    mission_plf_libelle_court: string | null;
     nature: string;
     nature_texte: string | null;
     nature_texte_libelle: string | null;
@@ -44,6 +55,7 @@ export interface AmendementResult {
     observations_additionnelles: string | null;
     ordre: number | null;
     parent_id: number | null;
+    programmes_plf: ProgrammePlf[];
     revision: string | null;
     session: string;
     session_libelle: string;

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

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+/**
+ * Debug script to check the DosLeg query compilation
+ * Helps identify the "column undefined" error
+ */
+export {};

package/lib/src/scripts/debug_dosleg_query.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+/**
+ * Debug script to check the DosLeg query compilation
+ * Helps identify the "column undefined" error
+ */
+import { db } from "../server/databases_postgres.js";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { sql } from "kysely";
+async function debugDoslegQuery() {
+    console.log("=== Debugging DosLeg Query ===\n");
+    try {
+        // Build the same query as findAllDossiers but capture SQL
+        const query = db
+            .withSchema("senat")
+            .selectFrom("dosleg_loi as loi")
+            .leftJoin("dosleg_typloi as typloi", "typloi.typloicod", "loi.typloicod")
+            .leftJoin("dosleg_etaloi as etaloi", "etaloi.etaloicod", "loi.etaloicod")
+            .leftJoin("dosleg_deccoc as deccoc", "deccoc.deccoccod", "loi.deccoccod")
+            .select((eb) => [
+            sql `rtrim(${eb.ref("loi.loicod")})`.as("code"),
+            "loi.numero as numero",
+            "loi.signet as signet",
+        ]);
+        const compiled = query.compile();
+        console.log("✓ Query compiled successfully (basic columns)\n");
+        console.log("SQL:", compiled.sql);
+        console.log("\n");
+        // Try with simple lectures first
+        const queryWithLectures = db
+            .withSchema("senat")
+            .selectFrom("dosleg_loi as loi")
+            .select((eb) => [
+            "loi.signet as signet",
+            jsonArrayFrom(eb.withSchema("senat").selectFrom("dosleg_lecture as lecture").select(["lecture.lecidt as id"])).as("lectures"),
+        ]);
+        const compiledWithLectures = queryWithLectures.compile();
+        console.log("✓ Query with simple lectures compiled successfully\n");
+        console.log("SQL:", compiledWithLectures.sql);
+        console.log("\n");
+        console.log("✅ Basic query structures seem valid");
+        console.log("\nThe issue is likely in one of the nested subqueries with cross-references.");
+        console.log("Try running findAllDossiers with the verbose flag to see exactly where it fails.");
+    }
+    catch (error) {
+        console.error("❌ Error during query compilation:");
+        console.error(error instanceof Error ? error.message : String(error));
+        process.exit(1);
+    }
+}
+debugDoslegQuery().catch(console.error);

package/lib/src/scripts/retrieve_collaborateurs.js

@@ -107,7 +107,7 @@ async function main() {
         // Disambiguation by first name prefix
         const targetFirstName = normalizeForComparison(row.senateur.prenom);
         const byFirstName = candidates.filter((c) => normalizeForComparison(c.prenom_usuel).startsWith(targetFirstName));
-        let senator = null;
+        let senator;
         if (candidates.length === 1) {
             senator = candidates[0];
         }
@@ -127,7 +127,8 @@ async function main() {
         // Deduplication
         const nName = normalizeForComparison(row.collaborateur.nom);
         const nFirstName = normalizeForComparison(row.collaborateur.prenom);
-        if (!collabs.some((c) => normalizeForComparison(c.nom) === nName && normalizeForComparison(c.prenom) === nFirstName)) {
+        if (!collabs.some((c) => normalizeForComparison(c.nom) === nName &&
+            normalizeForComparison(c.prenom) === nFirstName)) {
             collabs.push({
                 civilite: row.collaborateur.civilite,
                 nom: row.collaborateur.nom,
@@ -157,7 +158,9 @@ async function main() {
     }
     console.log(`${nbEnriched} senator(s) enriched with their collaborators`);
     if (unresolvedNames.size > 0) {
-        console.warn(`${nbUnresolved} PDF senator(s) could not be matched: ${[...unresolvedNames].slice(0, 10).join(", ")}${unresolvedNames.size > 10 ? "…" : ""}`);
+        const shown = [...unresolvedNames].slice(0, 10).join(", ");
+        const ellipsis = unresolvedNames.size > 10 ? "…" : "";
+        console.warn(`${nbUnresolved} PDF senator(s) could not be matched: ${shown}${ellipsis}`);
     }
 }
 main().catch((error) => {

package/lib/src/scripts/retrieve_open_data.js

@@ -273,7 +273,8 @@ function ensureForeignStagingServer(dataDir, options, runtime) {
             "OPTIONS (",
             `host '${escapeSqlLiteral(runtime.staging.host)}', `,
             `dbname '${escapeSqlLiteral(runtime.staging.name)}', `,
-            `port '${escapeSqlLiteral(String(runtime.staging.port))}'`,
+            `port '${escapeSqlLiteral(String(runtime.staging.port))}', `,
+            "fetch_size '10000'",
             ")",
         ].join(""),
     ].join(" "), dataDir, options, runtime.target);