@tricoteuses/senat 3.0.2 → 3.1.1

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

@@ -1,4 +1,4 @@
-import { DocumentMetadata } from "../types/texte.js";
+import { DocumentMetadata } from "../other_types/texte.js";
 type DownloadOptions = {
     force?: boolean;
     formats?: string[];

package/lib/src/scripts/retrieve_documents.js

@@ -2,11 +2,11 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import { DateTime } from "luxon";
 import path from "path";
-import { convertSenatXmlToHtml } from "../conversion_textes.js";
-import * as git from "../git.js";
-import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, ENRICHED_TEXTE_FOLDER, iterLoadSenatRapportUrls, iterLoadSenatTexteUrls, RAPPORT_FOLDER, TEXTE_FOLDER, } from "../loaders.js";
+import { convertSenatXmlToHtml } from "../server/conversion_textes.js";
+import * as git from "../server/git.js";
+import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, ENRICHED_TEXTE_FOLDER, iterLoadSenatRapportUrls, iterLoadSenatTexteUrls, RAPPORT_FOLDER, TEXTE_FOLDER, } from "../server/loaders.js";
 import { parseExposeDesMotifs, parseTexte, parseTexteFromFile } from "../parsers/texte.js";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../other_types/sessions.js";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
 import { ensureAndClearDir, fetchWithRetry, isOptionEmptyOrHasValue } from "./shared/util.js";
 let exitCode = 10; // 0: some data changed, 10: no modification

package/lib/src/scripts/retrieve_open_data.js

@@ -3,17 +3,18 @@ import { execFileSync } from "child_process";
 import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import { formatWithPrettier, makePgTsGenerator, markAsGenerated, processDatabase } from "kanel";
+import { makeKyselyHook } from "kanel-kysely";
 import path from "path";
 import StreamZip from "node-stream-zip";
 import readline from "readline";
 import { pipeline, Readable } from "stream";
 import { promisify } from "util";
 import * as windows1252 from "windows-1252";
-import config from "../config.js";
-import { getChosenDatasets, getEnabledDatasets } from "../datasets.js";
+import config from "../server/config.js";
+import { getChosenDatasets, getEnabledDatasets } from "../server/datasets.js";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
 import { buildIncrementalDatasetImportSql, buildNormalizeStagingSchemaSql } from "./shared/incremental_import_sql.js";
-import { buildGeneratedTableManifest, getGeneratedDefinitionPath, getGeneratedTableManifestPath, prefixedName, rawTypesDir, senatSchemaName, stagingSchemaName, stripDatasetPrefix, } from "./shared/prefixed_tables.js";
+import { buildGeneratedTableManifest, getGeneratedDefinitionPath, getGeneratedTableManifestPath, prefixedName, kanelTypesDir, kyselyTypesDir, senatSchemaName, stagingSchemaName, stripDatasetPrefix, } from "./shared/prefixed_tables.js";
 import { buildEnsureSchemaVersionTableSql, buildIncrementSchemaVersionSql, buildSchemaStructureFingerprintQuery, } from "./shared/schema_version.js";
 import { makeGenerateZodSchemas } from "./shared/make_generate_zod_schemas.js";
 import { buildExportStagingMetadataStatementsQuery } from "./shared/staging_metadata_sql.js";
@@ -29,7 +30,7 @@ const optionsDefinitions = [
     },
     {
         alias: "c",
-        help: "create TypeScript interfaces and Zod schemas from database tables into src/raw_types",
+        help: "create TypeScript interfaces, Zod schemas, and Kysely types from database tables",
         name: "schema",
         type: Boolean,
     },
@@ -379,11 +380,11 @@ function trimComment(comment) {
     return trimmed ? trimmed : undefined;
 }
 async function generateRawTypes(dataset, runtime, prefixedTables) {
-    await fs.ensureDir(rawTypesDir);
+    await fs.ensureDir(kanelTypesDir);
     const definitionFilePath = getGeneratedDefinitionPath(dataset.database);
     const manifestFilePath = getGeneratedTableManifestPath(dataset.database);
     const datasetPrefix = `${dataset.database}_`;
-    const datasetOutputPath = path.join(rawTypesDir, dataset.database);
+    const datasetOutputPath = path.join(kanelTypesDir, dataset.database);
     const generateZodSchemas = makeGenerateZodSchemas({
         castToSchema: true,
         getZodIdentifierMetadata: (column, details) => ({
@@ -447,7 +448,7 @@ async function generateRawTypes(dataset, runtime, prefixedTables) {
                 preRenderHooks: [generateZodSchemas],
             }),
         ],
-        outputPath: rawTypesDir,
+        outputPath: kanelTypesDir,
         postRenderHooks: [markAsGenerated, formatWithPrettier],
         schemaNames: [senatSchemaName],
         typescriptConfig: {
@@ -459,6 +460,68 @@ async function generateRawTypes(dataset, runtime, prefixedTables) {
     await fs.writeFile(definitionFilePath, generatedDefinition.replace(/\r\n/g, "\n"));
     await fs.writeFile(manifestFilePath, buildGeneratedTableManifest(dataset.database, prefixedTables));
 }
+async function generateKyselyTypes(dataset, runtime) {
+    const datasetPrefix = `${dataset.database}_`;
+    const datasetOutputDir = path.join(kyselyTypesDir, dataset.database);
+    await fs.remove(datasetOutputDir);
+    await fs.ensureDir(datasetOutputDir);
+    await processDatabase({
+        connection: {
+            database: runtime.target.name,
+            host: runtime.target.host,
+            password: runtime.target.password,
+            port: runtime.target.port,
+            user: runtime.target.user,
+        },
+        filter: (pgType) => pgType.schemaName === senatSchemaName && pgType.name.startsWith(datasetPrefix),
+        generators: [
+            makePgTsGenerator({
+                filter: (pgType) => pgType.schemaName === senatSchemaName && pgType.name.startsWith(datasetPrefix),
+                generateIdentifierType: (column, details, builtinType) => {
+                    const tableName = stripDatasetPrefix(details.name, dataset.database);
+                    return {
+                        ...builtinType,
+                        comment: undefined,
+                        name: toIdentifierName(tableName, column.name),
+                        typeDefinition: builtinType.typeDefinition.map((typeDefinition) => typeDefinition.replace(/ & \{ __flavor\?: '[^']+' \}/g, "").replace(/ & \{ __brand: '[^']+' \}/g, "")),
+                    };
+                },
+                getMetadata: (details, generateFor, builtinMetadata) => {
+                    const baseName = toPascalCase(stripDatasetPrefix(details.name, dataset.database));
+                    const suffix = generateFor === "selector" || generateFor === undefined ? "" : toPascalCase(generateFor);
+                    const tableComment = trimComment(details.comment);
+                    return {
+                        ...builtinMetadata,
+                        comment: tableComment ? [tableComment] : undefined,
+                        exportAs: generateFor === "selector" ? "default" : "named",
+                        name: `${baseName}${suffix}`,
+                        path: path.join(datasetOutputDir, baseName),
+                    };
+                },
+                getPropertyMetadata: (property, _details, _generateFor, builtinMetadata) => {
+                    const comment = trimComment(property.comment);
+                    return {
+                        ...builtinMetadata,
+                        comment: comment ? [comment] : undefined,
+                    };
+                },
+                preRenderHooks: [
+                    makeKyselyHook({
+                        databaseFilename: "Database",
+                        includeSchemaNameInTableName: false,
+                    }),
+                ],
+            }),
+        ],
+        outputPath: datasetOutputDir,
+        postRenderHooks: [markAsGenerated, formatWithPrettier],
+        schemaNames: [senatSchemaName],
+        typescriptConfig: {
+            enumStyle: "literal-union",
+            tsModuleFormat: "esm",
+        },
+    });
+}
 async function downloadFile(url, dest) {
     const response = await fetch(url);
     if (!response.ok) {
@@ -602,13 +665,14 @@ async function retrieveDataset(dataDir, dataset, options, runtime) {
         }
     }
     if (options["schema"]) {
-        await fs.ensureDir(rawTypesDir);
+        await fs.ensureDir(kanelTypesDir);
         if (!options["silent"]) {
             console.log(`Creating TypeScript definitions from prefixed ${senatSchemaName} tables ` +
                 `for '${dataset.database}' in database '${runtime.target.name}'...`);
         }
         const prefixedTables = listPrefixedTables(dataset, dataDir, options, runtime);
         await generateRawTypes(dataset, runtime, prefixedTables);
+        await generateKyselyTypes(dataset, runtime);
     }
 }
 function buildRuntimeContext() {

package/lib/src/scripts/retrieve_senateurs_photos.js

@@ -6,8 +6,8 @@ import path from "path";
 import { fileURLToPath } from "url";
 // import stream from "stream"
 // import util from "util"
-import * as git from "../git.js";
-import { findActif as findActifSenateurs } from "../model/sens.js";
+import * as git from "../server/git.js";
+import { findActif as findActifSenateurs } from "../server/sens.js";
 import { slugify } from "../strings.js";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
 const optionsDefinitions = [

package/lib/src/scripts/retrieve_videos.js

@@ -3,9 +3,9 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import fsp from "fs/promises";
 import path from "path";
-import * as git from "../git.js";
-import { AGENDA_FOLDER, iterLoadSenatAgendas } from "../loaders.js";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import * as git from "../server/git.js";
+import { AGENDA_FOLDER, iterLoadSenatAgendas } from "../server/loaders.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../other_types/sessions.js";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
 import { getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs } from "../utils/nvs-parsing.js";
 import { epochToParisDateTime, isAmbiguousTimeOriginal, toTargetEpoch } from "../utils/date.js";

package/lib/src/scripts/shared/incremental_import_sql.js

@@ -10,7 +10,8 @@ function buildConfiguredMergeKeysValues(datasetName, mergeKeys) {
         .sort(([leftTable], [rightTable]) => leftTable.localeCompare(rightTable))
         .map(([tableName, columns]) => {
         const sqlColumns = columns.map((columnName) => `'${escapeSqlLiteral(columnName)}'`).join(", ");
-        return `SELECT '${escapeSqlLiteral(prefixedName(datasetName, tableName))}' AS tablename, ARRAY[${sqlColumns}]::text[] AS key_columns`;
+        return (`SELECT '${escapeSqlLiteral(prefixedName(datasetName, tableName))}'` +
+            ` AS tablename, ARRAY[${sqlColumns}]::text[] AS key_columns`);
     })
         .join("\nUNION ALL\n");
 }
@@ -371,7 +372,10 @@ BEGIN
       IF column_row.generated_kind = 's' THEN
         column_definition :=
           column_definition ||
-          ' GENERATED ALWAYS AS (' || replace(column_row.default_expression, '${stagingSchema}.', '${senatSchemaName}.') || ') STORED';
+          ' GENERATED ALWAYS AS (' ||
+          replace(column_row.default_expression,
+            '${stagingSchema}.', '${senatSchemaName}.') ||
+          ') STORED';
       ELSIF column_row.identity_kind = 'a' THEN
         column_definition := column_definition || ' GENERATED ALWAYS AS IDENTITY';
       ELSIF column_row.identity_kind = 'd' THEN
@@ -599,8 +603,12 @@ BEGIN
       AND columns.table_name = table_row.tablename;
 
     SELECT
-      string_agg(format('%1$I = s.%1$I', columns.column_name), ', ' ORDER BY columns.ordinal_position),
-      string_agg(format('t.%1$I IS DISTINCT FROM s.%1$I', columns.column_name), ' OR ' ORDER BY columns.ordinal_position)
+      string_agg(
+        format('%1$I = s.%1$I', columns.column_name),
+        ', ' ORDER BY columns.ordinal_position),
+      string_agg(
+        format('t.%1$I IS DISTINCT FROM s.%1$I', columns.column_name),
+        ' OR ' ORDER BY columns.ordinal_position)
     INTO update_assignments, change_condition
     FROM information_schema.columns columns
     WHERE columns.table_schema = '${escapedStagingSchema}'
@@ -636,8 +644,12 @@ BEGIN
     END IF;
 
     SELECT
-      'jsonb_build_array(' || string_agg(format('t.%I', columns.column_name), ', ' ORDER BY columns.ordinal_position) || ')',
-      'jsonb_build_array(' || string_agg(format('s.%I', columns.column_name), ', ' ORDER BY columns.ordinal_position) || ')'
+      'jsonb_build_array(' ||
+        string_agg(format('t.%I', columns.column_name),
+          ', ' ORDER BY columns.ordinal_position) || ')',
+      'jsonb_build_array(' ||
+        string_agg(format('s.%I', columns.column_name),
+          ', ' ORDER BY columns.ordinal_position) || ')'
     INTO target_row_signature_expression, staging_row_signature_expression
     FROM information_schema.columns columns
     WHERE columns.table_schema = '${escapedStagingSchema}'
@@ -745,7 +757,10 @@ BEGIN
       END IF;
 
       EXECUTE format(
-        'INSERT INTO ${senatSchemaName}.%1$I (%2$s) SELECT %3$s FROM %4$I.%1$I s WHERE NOT EXISTS (SELECT 1 FROM ${senatSchemaName}.%1$I t WHERE %5$s)',
+        'INSERT INTO ${senatSchemaName}.%1$I (%2$s) ' ||
+        'SELECT %3$s FROM %4$I.%1$I s ' ||
+        'WHERE NOT EXISTS ' ||
+        '(SELECT 1 FROM ${senatSchemaName}.%1$I t WHERE %5$s)',
         table_row.tablename,
         column_list,
         staging_column_list,

package/lib/src/scripts/shared/prefixed_tables.d.ts

@@ -1,5 +1,6 @@
 export declare const senatSchemaName = "senat";
-export declare const rawTypesDir: string;
+export declare const kanelTypesDir: string;
+export declare const kyselyTypesDir: string;
 export declare function prefixedName(datasetName: string, relationName: string): string;
 export declare function stagingSchemaName(datasetName: string): string;
 export declare function escapeRegExp(text: string): string;

package/lib/src/scripts/shared/prefixed_tables.js

@@ -1,6 +1,7 @@
 import path from "path";
 export const senatSchemaName = "senat";
-export const rawTypesDir = path.resolve("src", "raw_types");
+export const kanelTypesDir = path.resolve("src", "kanel_types");
+export const kyselyTypesDir = path.resolve("src", "kysely_types");
 export function prefixedName(datasetName, relationName) {
     return `${datasetName}_${relationName}`;
 }
@@ -15,10 +16,10 @@ export function stripDatasetPrefix(relationName, datasetName) {
     return relationName.startsWith(datasetPrefix) ? relationName.slice(datasetPrefix.length) : relationName;
 }
 export function getGeneratedDefinitionPath(datasetName) {
-    return path.join(rawTypesDir, `${datasetName}.ts`);
+    return path.join(kanelTypesDir, `${datasetName}.ts`);
 }
 export function getGeneratedTableManifestPath(datasetName) {
-    return path.join(rawTypesDir, `${datasetName}.tables.json`);
+    return path.join(kanelTypesDir, `${datasetName}.tables.json`);
 }
 export function buildGeneratedTableManifest(datasetName, prefixedTables) {
     const manifest = {

package/lib/src/scripts/shared/staging_import.d.ts

@@ -1,3 +1,3 @@
-import type { Dataset } from "../../datasets.js";
+import type { Dataset } from "../../server/datasets.js";
 export declare function isCopyFromStdinLine(line: string): boolean;
 export declare function rewriteLineForStagingImport(line: string, dataset: Dataset, stagingSchema: string, inCopyData?: boolean): string;

package/lib/src/scripts/validate_prefixed_tables.js

@@ -1,21 +1,22 @@
 import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
-import { sql } from "../databases_postgres.js";
-import { getChosenDatasets, getEnabledDatasets } from "../datasets.js";
+import { sql } from "kysely";
+import { db } from "../server/databases_postgres.js";
+import { getChosenDatasets, getEnabledDatasets } from "../server/datasets.js";
 import { categoriesOption, silentOption } from "./shared/cli_helpers.js";
 import { extractPrefixedTableNamesFromGeneratedManifest, getGeneratedTableManifestPath, senatSchemaName, } from "./shared/prefixed_tables.js";
 const optionsDefinitions = [categoriesOption, silentOption];
 const options = commandLineArgs(optionsDefinitions);
 async function listPrefixedSenatTables(dataset) {
     const prefix = `${dataset.database}_`;
-    const rows = await sql `
-    select tablename as relation_name
+    const result = await sql `
+    select tablename
     from pg_tables
     where schemaname = ${senatSchemaName}
       and tablename like ${prefix + "%"}
     order by tablename
-  `;
-    return rows.map(({ relation_name }) => relation_name);
+  `.execute(db);
+    return result.rows.map(({ tablename }) => tablename);
 }
 function getGeneratedDefinitionPath(dataset) {
     return getGeneratedTableManifestPath(dataset.database);
@@ -26,14 +27,14 @@ function listExpectedPrefixedSenatTables(dataset) {
     return extractPrefixedTableNamesFromGeneratedManifest(manifest, dataset.database);
 }
 async function listColumns(schema, relationName) {
-    const rows = await sql `
+    const result = await sql `
     select column_name
     from information_schema.columns
     where table_schema = ${schema}
       and table_name = ${relationName}
     order by ordinal_position
-  `;
-    return rows.map(({ column_name }) => column_name);
+  `.execute(db);
+    return result.rows.map(({ column_name }) => column_name);
 }
 async function validateDataset(dataset) {
     const issues = [];
@@ -86,7 +87,7 @@ async function validatePrefixedTables() {
             console.error(`- ${issue}`);
         }
     }
-    await sql.end();
+    await db.destroy();
     if (hasErrors) {
         process.exit(1);
     }
@@ -95,7 +96,7 @@ async function validatePrefixedTables() {
     }
 }
 validatePrefixedTables().catch(async (error) => {
-    await sql.end();
+    await db.destroy();
     console.error(error);
     process.exit(1);
 });

package/lib/src/scrutins.d.ts

@@ -0,0 +1,47 @@
+export interface VoteScrutinRow {
+    groupe_politique_code: string | null;
+    groupe_politique_id: string | null;
+    matricule_delegant: string | null;
+    matricule_votant: string;
+    position: string | null;
+    statut_votant: string | null;
+    titre_votant: string | null;
+}
+export interface GroupeVotantRow {
+    groupe_politique_code: string | null;
+    nombre_abstentions: string;
+    nombre_contre: string;
+    nombre_non_votants: string;
+    nombre_pour: string;
+    nombre_votants: string;
+}
+export interface MiseAuPointRow {
+    ordre: string | null;
+    texte: string;
+    url: string | null;
+}
+export interface ScrutinResult {
+    date_scrutin: string | null;
+    date_scrutin_effective: string | null;
+    groupes_votants: GroupeVotantRow[];
+    intitule: string | null;
+    lecture_id: string | null;
+    lecture_libelle: string | null;
+    mises_au_point: MiseAuPointRow[];
+    nombre_contre: string | null;
+    nombre_contre_seance: string | null;
+    nombre_majorite: string | null;
+    nombre_majorite_seance: string | null;
+    nombre_pour: string | null;
+    nombre_pour_seance: string | null;
+    nombre_suffrages: string | null;
+    nombre_suffrages_seance: string | null;
+    nombre_votants: string | null;
+    nombre_votants_seance: string | null;
+    note: string | null;
+    numero: string;
+    session: string;
+    signet_dossier: string | null;
+    type_lecture: string | null;
+    votes: VoteScrutinRow[];
+}

package/lib/{model → src/server}/agenda.d.ts

@@ -1,4 +1,4 @@
-import { AgendaEvent } from "../types/agenda";
+import { AgendaEvent } from "../other_types/agenda.js";
 export declare function getStartAndEndTimes(timeStr: string | null | undefined, dateISO: string): {
     startTime: string | null;
     endTime: string | null;

package/lib/{model → src/server}/agenda.js

@@ -1,7 +1,7 @@
 import { JSDOM } from "jsdom";
 import { DateTime } from "luxon";
 import path from "path";
-import { ID_DATE_FORMAT, STANDARD_DATE_FORMAT } from "../scripts/datautil";
+import { ID_DATE_FORMAT, STANDARD_DATE_FORMAT } from "../scripts/datautil.js";
 const FR_TZ = "Europe/Paris";
 function eventIsSeance(eventElement) {
     return eventElement.classList.contains("evt-seance");
@@ -113,7 +113,7 @@ function transformAgenda(document, fileName) {
         const { startTime, endTime } = getStartAndEndTimes(timeOriginal, date);
         const titre = eventElement.querySelector(".titre")?.textContent?.trim() || "";
         const organe = eventElement.querySelector(".organe")?.textContent?.trim() || null;
-        const objet = eventElement.querySelector(".objet")?.textContent?.trim()?.replace(/^- /, "") || null;
+        const objet = eventElement.querySelector(".objet")?.textContent?.trim()?.replace(/^- /, "") || null;
         const lieu = eventElement.querySelector(".lieu")?.textContent || null;
         const videoElement = eventElement.querySelector(".video");
         const urlDossierSenat = getUrlDossierSenat(eventElement.querySelectorAll(".lien a"));
@@ -142,7 +142,7 @@ export async function parseAgendaFromFile(htmlFilePath) {
         return transformAgenda(document, fileName);
     }
     catch (error) {
-        console.error(`Could not parse texte with error ${error}`);
+        console.error(`Could not parse texte with error ${error.message}`);
     }
     return null;
 }

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

@@ -0,0 +1,2 @@
+import type { AmendementResult } from "../rich_types/ameli.js";
+export declare function findAllAmendements(fromSession?: number): AsyncGenerator<AmendementResult, void, unknown>;

package/lib/src/server/ameli.js

@@ -0,0 +1,153 @@
+import { sql } from "kysely";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { db, streamRawQuery } from "./databases_postgres.js";
+export async function* findAllAmendements(fromSession) {
+    const baseQuery = db
+        .withSchema("senat")
+        .selectFrom("ameli_amd as amd")
+        .leftJoin("ameli_sub as sub", "sub.id", "amd.subid")
+        .leftJoin("ameli_typsub as typsub", "typsub.id", "sub.typid")
+        .leftJoin("ameli_typrect as typrect", "typrect.id", "amd.typrectid")
+        .leftJoin("ameli_txt_ameli as txt_ameli", "txt_ameli.id", "amd.txtid")
+        .leftJoin("ameli_etatxt as etatxt", "etatxt.id", "txt_ameli.txtetaid")
+        .leftJoin("ameli_ses as ses", "ses.id", "txt_ameli.sesdepid")
+        .leftJoin("ameli_typses as typses", "typses.id", "ses.typid")
+        .leftJoin("ameli_nat as nat", "nat.id", "txt_ameli.natid")
+        .leftJoin("ameli_lec_ameli as lec_ameli", "lec_ameli.id", "txt_ameli.lecid")
+        .leftJoin("dosleg_texte as texte", (join) => join.onRef("ses.ann", "=", "texte.sesann").onRef("txt_ameli.numabs", "=", "texte.texnum"))
+        .leftJoin("dosleg_lecass as lecass", "lecass.lecassidt", "texte.lecassidt")
+        .leftJoin("ameli_mot as mot", "mot.id", "amd.motid")
+        .leftJoin("ameli_avicom as avicom", "avicom.id", "amd.avcid")
+        .leftJoin("ameli_avigvt as avigvt", "avigvt.id", "amd.avgid")
+        .leftJoin("ameli_sor as sor", "sor.id", "amd.sorid")
+        .leftJoin("ameli_irr as irr", "irr.id", "amd.irrid")
+        .leftJoin("ameli_grppol_ameli as grppol_ameli", "grppol_ameli.entid", "amd.nomentid")
+        .leftJoin("ameli_com_ameli as com_ameli", "com_ameli.entid", "amd.nomentid")
+        .leftJoin("ameli_cab as cab", "cab.entid", "amd.nomentid")
+        .select((eb) => [
+        sql `${eb.ref("ses.ann")}::text`.as("session"),
+        "ses.lil as session_libelle",
+        "typses.lib as type_session",
+        "txt_ameli.doslegsignet as signet_dossier_legislatif",
+        "nat.libcourt as nature_texte",
+        "nat.lib as nature_texte_libelle",
+        "txt_ameli.numabs as numero_texte",
+        "txt_ameli.numado as numero_adoption_texte",
+        "txt_ameli.int as intitule_texte",
+        "etatxt.lic as etat_texte",
+        "etatxt.lib as etat_texte_libelle",
+        "etatxt.txttyp as type_texte",
+        "lec_ameli.lib as lecture",
+        eb
+            .case()
+            .when("amd.typ", "=", "A")
+            .then("Amendement")
+            .when("amd.typ", "=", "M")
+            .then("Motion")
+            .when("amd.typ", "=", "S")
+            .then("Sous-amendement")
+            .else("")
+            .end()
+            .as("nature"),
+        "amd.id",
+        "amd.amdperid as parent_id",
+        "amd.ideid as identique_id",
+        "amd.discomid as discussion_commune_id",
+        sql `${eb.ref("amd.num")}`.as("numero"),
+        "amd.numabs as numero_absolu",
+        "amd.ord as ordre",
+        "amd.accgou as accepte_gouvernement",
+        "amd.txtid as texte_id",
+        "sub.lib as subdivision_libelle",
+        "sub.lic as subdivision_libelle_court",
+        "sub.pos as subdivision_position_texte",
+        "sub.posder as subdivision_position_discussion",
+        "sub.merid as subdivision_mere_id",
+        "sub.sig as subdivision_signet",
+        "sub.comdelid as subdivision_commission_id",
+        "sub.dupl as subdivision_dupliquee",
+        "typsub.lib as subdivision_type",
+        "amd.alinea",
+        "amd.obs as observations",
+        "amd.mot as observations_additionnelles",
+        sql `to_char(${eb.ref("amd.datdep")}, 'YYYY-MM-DD')`.as("date_depot"),
+        "amd.dis as dispositif",
+        "amd.obj as objet",
+        "typrect.lib as type_rectification",
+        "mot.lib as motion_libelle",
+        eb
+            .case()
+            .when("amd.etaid", "=", 7)
+            .then("Diffusé")
+            .when("amd.etaid", "=", 8)
+            .then("Retiré avant réunion ou séance")
+            .when("amd.etaid", "=", 9)
+            .then("Examiné en commission ou séance")
+            .when("amd.etaid", "=", 10)
+            .then("Irrecevable")
+            .when("amd.etaid", "=", 11)
+            .then("Irrecevable")
+            .else("")
+            .end()
+            .as("etat"),
+        "avicom.lib as avis_commission",
+        "avigvt.lib as avis_gouvernement",
+        eb.fn.coalesce("sor.lib", "irr.libirr").as("sort"),
+        "amd.rev as revision",
+        sql `
+        (
+          case
+            when ${eb.ref("amd.num")} like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
+            else 'https://www.senat.fr/amendements/'
+          end ||
+          ${eb.ref("ses.ann")}::text || '-' ||
+          (${eb.ref("ses.ann")}::integer + 1)::text || '/' ||
+          ${eb.ref("txt_ameli.numabs")} || '/Amdt_' ||
+          ${eb.ref("amd.num")} || '.html'
+        )
+      `.as("url"),
+        "grppol_ameli.lilcou as au_nom_de_groupe_politique",
+        sql `rtrim(${eb.ref("com_ameli.lil")})`.as("au_nom_de_commission"),
+        sql `rtrim(${eb.ref("com_ameli.cod")})`.as("code_commission"),
+        sql `(${eb.ref("cab.entid")} is not null)`.as("auteur_est_gouvernement"),
+        // Sous-requête scalaire: numéro de scrutin
+        eb
+            .withSchema("senat")
+            .selectFrom("dosleg_amescr as amescr")
+            .leftJoin("dosleg_scr as scr", (join) => join.onRef("amescr.scrnum", "=", "scr.scrnum").onRef("amescr.sesann", "=", "scr.sesann"))
+            .leftJoin("dosleg_date_seance as date_seance", "date_seance.code", "scr.code")
+            .select(sql `amescr.scrnum::text`.as("scrnum"))
+            .whereRef("amescr.amescrnum", "=", "amd.num")
+            .whereRef("amescr.sesann", "=", "ses.ann")
+            .whereRef("date_seance.lecidt", "=", "texte.lecassidt")
+            .limit(1)
+            .as("scrutin_num"),
+        // Sous-requête pour les auteurs
+        jsonArrayFrom(eb
+            .withSchema("senat")
+            .selectFrom("ameli_amdsen as amdsen")
+            .leftJoin("ameli_sen_ameli as sen_ameli", "sen_ameli.entid", "amdsen.senid")
+            .leftJoin("ameli_grppol_ameli as grppol_ameli2", "grppol_ameli2.entid", "amdsen.grpid")
+            .select([
+            "amdsen.prenomuse as prenom",
+            "amdsen.hom as homonyme",
+            "amdsen.nomuse as nom",
+            "amdsen.qua as qualite",
+            sql `amdsen.rng::text`.as("rang"),
+            "sen_ameli.mat as matricule",
+            "amdsen.grpid as groupe_politique_id",
+            "grppol_ameli2.cod as group_politique_code",
+            "grppol_ameli2.libcou as groupe_politique_libelle_court",
+            "grppol_ameli2.lilcou as groupe_politique_libelle",
+        ])
+            .whereRef("amdsen.amdid", "=", "amd.id")
+            .orderBy("amdsen.rng", "asc")).as("auteurs"),
+    ]);
+    const compiledQuery = (fromSession === undefined ? baseQuery : baseQuery.where("ses.ann", ">=", String(fromSession))).compile();
+    for await (const row of streamRawQuery(compiledQuery)) {
+        yield {
+            ...row,
+            auteurs: row.auteurs ?? [],
+        };
+    }
+}

package/lib/{model → src/server}/commission.d.ts

@@ -1,10 +1,11 @@
 import * as cheerio from "cheerio";
-import { CompteRendu } from "../types/compte_rendu";
-import { Reunion } from "../types/agenda";
-export declare function getRemainingTextAfterSpeakerHeader($: cheerio.CheerioAPI, $p: cheerio.Cheerio<any>): string;
+import type { AnyNode } from "domhandler";
+import { CompteRendu } from "../other_types/compte_rendu.js";
+import { Reunion } from "../other_types/agenda.js";
+export declare function getRemainingTextAfterSpeakerHeader($: cheerio.CheerioAPI, $p: cheerio.Cheerio<AnyNode>): string;
 export type DaySection = {
     title: string;
-    $start: cheerio.Cheerio<any>;
+    $start: cheerio.Cheerio<AnyNode>;
     time?: string;
 };
 export declare function cleanTitle(t: string): string;

package/lib/{model → src/server}/commission.js

@@ -1,9 +1,9 @@
 import * as cheerio from "cheerio";
 import path from "path";
-import { makeReunionUid } from "../utils/reunion_parsing";
-import { norm } from "../utils/string_cleaning";
-import { frDateToISO, hourShortToStartTime } from "../utils/date";
-import { toCRDate } from "./util";
+import { makeReunionUid } from "../utils/reunion_parsing.js";
+import { norm } from "../utils/string_cleaning.js";
+import { frDateToISO, hourShortToStartTime } from "../utils/date.js";
+import { toCRDate } from "../util.js";
 const PARA_h3_SEL = "p.sh_justify, p.sh_center, p.sh_marge, p[align], li, h3";
 function findDayRoot($, targetISO) {
     let $root = $();
@@ -39,7 +39,7 @@ function collectLeadingHeaderStrongEls($, $clone) {
             }
             if ($n.is("a") && $n.children("strong, b").length) {
                 $n.children("strong, b").each((_, el) => {
-                    els.push($(el));
+                    els.push(el);
                 });
                 continue;
             }
@@ -68,7 +68,7 @@ function buildPointsFromParagraphs($, paras) {
     const normSpeaker = (s) => s
         .normalize("NFKC")
         .replace(/\s+/g, " ")
-        .replace(/[:\.]\s*$/, "")
+        .replace(/[.:]\s*$/, "")
         .trim();
     const normQual = (s) => s
         .normalize("NFKC")