@tricoteuses/senat 3.0.2 → 3.1.0

package/lib/src/rich_types/dosleg.js

@@ -0,0 +1,193 @@
+export function getCodeActeLecture(codeNatureDossier, typeLecture, assemblee) {
+    const codeAssemblee = assemblee === "Sénat" ? "SN" : assemblee === "Assemblée nationale" ? "AN" : null;
+    if (typeLecture === "Commission mixte paritaire") {
+        return "CMP";
+    }
+    if (!codeAssemblee) {
+        return null;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Première lecture") {
+        return `${codeAssemblee}1`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Deuxième lecture") {
+        return `${codeAssemblee}2`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Troisième lecture") {
+        return `${codeAssemblee}3`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Quatrième lecture") {
+        return `${codeAssemblee}4`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Nouvelle lecture") {
+        return `${codeAssemblee}NLEC`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Lecture définitive") {
+        return `${codeAssemblee}LDEF`;
+    }
+    if (["ppr"].includes(codeNatureDossier) && typeLecture === "Première lecture") {
+        return `${codeAssemblee}LUNI`;
+    }
+    return null;
+}
+function getDateSortValue(value) {
+    if (!value) {
+        return Number.POSITIVE_INFINITY;
+    }
+    const timestamp = new Date(value).getTime();
+    return Number.isNaN(timestamp) ? Number.POSITIVE_INFINITY : timestamp;
+}
+function compareByDate(left, right) {
+    return getDateSortValue(left.date) - getDateSortValue(right.date);
+}
+function getPhasePrefix(lecture, assemblee) {
+    if (assemblee !== "Sénat")
+        return null;
+    const typeLibelle = (lecture.type_lecture || "").toLowerCase();
+    if (typeLibelle.includes("cmp") || typeLibelle.includes("mixte"))
+        return "CMP";
+    if (typeLibelle.includes("nouvelle lecture"))
+        return "SNNLEC";
+    if (typeLibelle.includes("définitive"))
+        return "SNLDEF";
+    if (typeLibelle.includes("unique"))
+        return "SNLUNI";
+    if (lecture.ordre_lecture) {
+        return `SN${lecture.ordre_lecture}`;
+    }
+    if (typeLibelle.includes("première"))
+        return "SN1";
+    if (typeLibelle.includes("deuxième") || typeLibelle.includes("seconde"))
+        return "SN2";
+    return "SN1";
+}
+export function buildActesLegislatifs(dossier) {
+    const actes = [];
+    const loiSignet = dossier.signet;
+    const lectures = dossier.lectures ?? [];
+    for (const lecture of lectures) {
+        const lecturesAssemblee = lecture.lectures_assemblee ?? [];
+        for (const lecAss of lecturesAssemblee) {
+            if (lecAss.assemblee !== "Sénat")
+                continue;
+            const phasePrefix = getPhasePrefix(lecture, lecAss.assemblee);
+            if (!phasePrefix)
+                continue;
+            const textes = lecAss.textes ?? [];
+            const textesTries = [...textes].sort(compareByDate);
+            const depotTexte = textesTries.find((t) => (t.origine || "").toLowerCase().includes("déposé") ||
+                (t.origine || "").toLowerCase().includes("transmis") ||
+                t.ordre_origine === "0");
+            if (depotTexte && depotTexte.date) {
+                actes.push({
+                    code_acte: `${phasePrefix}-DEPOT`,
+                    date: depotTexte.date,
+                    libelle: `Dépôt du texte n°${depotTexte.numero}`,
+                    id: depotTexte.id,
+                    numero: depotTexte.numero,
+                    uid: `${loiSignet}-${phasePrefix}-DEPOT`,
+                    session: lecAss.session,
+                    chambre: "SN",
+                    signet_dossier: loiSignet,
+                    texte_url: depotTexte.url,
+                    code_organisme: null,
+                });
+            }
+            const rapports = lecAss.rapports ?? [];
+            for (const rap of rapports) {
+                if (rap.date) {
+                    actes.push({
+                        code_acte: `${phasePrefix}-COM-FOND`,
+                        date: rap.date,
+                        libelle: `Rapport n°${rap.numero} de la commission`,
+                        id: rap.id,
+                        numero: rap.numero,
+                        code_organisme: rap.code_organisme ?? null,
+                        uid: `${loiSignet}-${phasePrefix}-COM`,
+                        session: lecAss.session,
+                        chambre: "SN",
+                        signet_dossier: loiSignet,
+                        texte_url: rap.url,
+                    });
+                }
+            }
+            const datesSeances = lecAss.dates_seances ?? [];
+            if (datesSeances.length > 0) {
+                datesSeances.sort(compareByDate);
+                const premiereSeance = datesSeances[0];
+                if (premiereSeance && premiereSeance.date) {
+                    actes.push({
+                        code_acte: `${phasePrefix}-DEBATS-SEANCE`,
+                        date: premiereSeance.date,
+                        libelle: "Discussion en séance publique",
+                        id: null,
+                        uid: `${loiSignet}-${phasePrefix}-DEBATS-SEANCE`,
+                        session: lecAss.session,
+                        chambre: "SN",
+                        signet_dossier: loiSignet,
+                        code_organisme: null,
+                    });
+                }
+            }
+            const texteFinal = [...textesTries].reverse().find((t) => {
+                const origine = (t.origine || "").toLowerCase();
+                return (origine.includes("adopté") ||
+                    origine.includes("rejeté") ||
+                    origine.includes("devenu résolution") ||
+                    t.code_adoption === "O");
+            });
+            if (texteFinal && texteFinal.date) {
+                const origine = (texteFinal.origine || "").toLowerCase();
+                let libelleStatut = "Adopté";
+                if (origine.includes("rejeté")) {
+                    libelleStatut = "Rejeté";
+                }
+                else if (origine.includes("devenue résolution")) {
+                    libelleStatut = "Adopté";
+                }
+                actes.push({
+                    code_acte: `${phasePrefix}-DEBATS-DEC`,
+                    date: texteFinal.date,
+                    libelle: `${libelleStatut === "Adopté" ? "Adoption" : "Rejet"} (Texte n°${texteFinal.numero})`,
+                    id: texteFinal.id,
+                    numero: texteFinal.numero,
+                    adoption: libelleStatut,
+                    uid: `${loiSignet}-DEC-${texteFinal.numero}`,
+                    session: lecAss.session,
+                    chambre: "SN",
+                    signet_dossier: loiSignet,
+                    texte_url: texteFinal.url,
+                    code_organisme: null,
+                });
+            }
+        }
+    }
+    if (dossier.date_decision_CoC) {
+        actes.push({
+            code_acte: "CC",
+            date: dossier.date_decision_CoC,
+            libelle: "Décision du Conseil constitutionnel",
+            id: dossier.url_decision_CoC,
+            uid: `${loiSignet}-CC`,
+            chambre: "AN",
+            signet_dossier: loiSignet,
+            code_organisme: null,
+            texte_url: dossier.url_decision_CoC || dossier.url_dossier_CoC,
+        });
+    }
+    if (dossier.date_promulgation) {
+        actes.push({
+            code_acte: "PROM",
+            date: dossier.date_promulgation,
+            libelle: "Promulgation de la loi",
+            date_publication_JO: dossier.date_publication_JO,
+            numero_JO: dossier.numero_JO,
+            url_legifrance: dossier.url_JO,
+            id: dossier.url_JO,
+            uid: `${loiSignet}-PROM`,
+            chambre: "AN",
+            signet_dossier: loiSignet,
+            code_organisme: null,
+        });
+    }
+    return actes.sort(compareByDate);
+}

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

@@ -0,0 +1,55 @@
+import { TamQuestions } from "../kanel_types/questions.js";
+export interface QuestionReponseRow {
+    date_erratum_JO: string | null;
+    date_reponse_JO: string | null;
+    ministere_reponse: string | null;
+    ministere_reponse_id: string | null;
+    page_JO: string | null;
+    texte: string | null;
+    texte_erratum: string | null;
+    url: string | null;
+}
+export interface QuestionResult {
+    circonscription: string | null;
+    circonscription_numero: string | null;
+    civilite: string | null;
+    date_cloture: string | null;
+    date_erratum_JO: string | null;
+    date_publication_JO: string | null;
+    date_reponse_JO: string | null;
+    date_signalement: string | null;
+    date_transmission: string | null;
+    etat_code: string | null;
+    etat_libelle: string | null;
+    etat_tri: string | null;
+    groupe: string | null;
+    legislature: string | null;
+    matricule: string;
+    ministere_depot: string | null;
+    ministere_depot_date_debut: string | null;
+    ministere_depot_id: string | null;
+    ministere_reponse: string | null;
+    ministere_transmission: string | null;
+    nature: string | null;
+    nature_libelle: string | null;
+    nom: string | null;
+    nom_technique: string | null;
+    numero: string | null;
+    page_JO: string | null;
+    page_erratum_JO: string | null;
+    prenom: string | null;
+    reference: string | null;
+    reference_question_rappelee: string | null;
+    republique: string | null;
+    reponses: QuestionReponseRow[];
+    rubrique: string | null;
+    sort: string | null;
+    sort_code: string | null;
+    sort_tri: string | null;
+    texte: string | null;
+    texte_erratum: string | null;
+    themes: string[];
+    titre: string | null;
+    type_appartenance: string | null;
+}
+export type { TamQuestions as Question };

package/lib/src/rich_types/questions.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,104 @@
+export interface FonctionRow {
+    date_debut: string | null;
+    date_fin: string | null;
+    libelle: string | null;
+}
+export interface MandatSenateurRow {
+    code_circonscription: string | null;
+    date_debut: string | null;
+    date_fin: string | null;
+    etat: string | null;
+    etat_debut: string | null;
+    etat_fin: string | null;
+}
+export interface MandatOrganismeRow {
+    code_organisme: string;
+    date_debut: string | null;
+    date_fin: string | null;
+    etat: string | null;
+    fonctions: FonctionRow[];
+    libelle: string | null;
+    type_code_organisme: string | null;
+    type_organisme: string | null;
+}
+export interface AdressePointContactRow {
+    bureau_distributeur: string | null;
+    code_cedex: string | null;
+    code_postal: string | null;
+    commune: string | null;
+    complement: string | null;
+    complement2: string | null;
+    libelle_cedex: string | null;
+    nom_voie: string | null;
+    numero_voie: string | null;
+}
+export interface TelephonePointContactRow {
+    numero: string | null;
+    type: string;
+}
+export interface PointContactRow {
+    adresses: AdressePointContactRow[];
+    id: string;
+    libelle: string | null;
+    telephones: TelephonePointContactRow[];
+    type: string;
+}
+export interface UrlRow {
+    code_url: string;
+    url: string;
+}
+export interface SenateurResult {
+    PCS_INSEE: string | null;
+    PCS_INSEE_24: string | null;
+    PCS_INSEE_42: string | null;
+    PCS_INSEE_8: string | null;
+    circonscription: string | null;
+    code_circonscription: string | null;
+    code_commission_permanente: string | null;
+    code_groupe_politique: string | null;
+    commission_permanente: string | null;
+    commissions: MandatOrganismeRow[];
+    courrier_electronique: string | null;
+    date_deces: string | null;
+    date_naissance: string | null;
+    delegations: MandatOrganismeRow[];
+    description_profession: string | null;
+    etat: string;
+    fonction_bureau_senat: string | null;
+    fonctions_bureau: FonctionRow[];
+    groupe_politique: string | null;
+    groupes: MandatOrganismeRow[];
+    mandats_senateur: MandatSenateurRow[];
+    matricule: string;
+    nom_usuel: string | null;
+    points_contact: PointContactRow[];
+    prenom_usuel: string;
+    qualite: string;
+    siege: string | null;
+    url_hatvp: string | null;
+    urls: UrlRow[];
+}
+export interface CirconscriptionResult {
+    article: string | null;
+    code: string;
+    date_debut: string | null;
+    date_fin: string | null;
+    etat: string | null;
+    identifiant: string;
+    libelle_departement: string;
+    libelle_region: string;
+    nombre_senateurs: string | null;
+    url: string | null;
+}
+export interface OrganismeResult {
+    code: string;
+    date_debut: string | null;
+    date_fin: string | null;
+    etat: string | null;
+    libelle: string | null;
+    libelle_court: string | null;
+    libelle_long: string | null;
+    type_code: string;
+    type_libelle: string | null;
+    url: string | null;
+}

package/lib/src/rich_types/sens.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,6 @@
+export declare const UNDEFINED_SESSION = 0;
+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/rich_types/sessions.js

@@ -0,0 +1,19 @@
+export const UNDEFINED_SESSION = 0;
+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 === UNDEFINED_SESSION) {
+        return Array.from(sessionOptions);
+    }
+    const sessionIndex = sessionOptions.findIndex((session) => startSession === session);
+    if (sessionIndex >= 0) {
+        return sessionOptions.slice(sessionIndex);
+    }
+    return [];
+}

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

@@ -0,0 +1,72 @@
+import { DocumentResult } from "../documents.js";
+export declare enum DivisionType {
+    tome = 1,
+    part = 2,
+    book = 3,
+    title = 4,
+    subtitle = 5,
+    chapter = 6,
+    section = 7,
+    subsection = 8,
+    paragraph = 9,
+    article = 10,
+    alinea = 11,
+    division = 12
+}
+export type DivisionTag = keyof typeof DivisionType;
+export interface DocumentMetadata {
+    name: string;
+    session: number | null | undefined;
+    date?: string | null;
+    url_expose_des_motifs?: URL;
+    url_xml?: URL;
+    url_html: URL;
+    url_pdf: URL;
+}
+export interface FlatTexte extends Partial<DocumentResult> {
+    titre: string | null;
+    titre_court: string | null;
+    url_dossier_senat: string | null;
+    url_dossier_assemblee: string | null;
+    date_presentation: Date | null;
+    date_depot: Date | null;
+    date_publication_xml: Date | null;
+    version: Version | null;
+    divisions: Division[];
+    expose_motifs?: ExposeDesMotifs | null;
+}
+export type Version = "RECT" | "RECT_BIS" | "RECT_TER" | "RECT_QUATER" | "RECT_QUINQUIES";
+export interface Step {
+    eId: string;
+    date: Date | null;
+    type: string | null;
+    session: string | null;
+    numero: string | null;
+    version: Version | null;
+    outcome: string | null;
+}
+export interface Division {
+    index: number;
+    eId: string;
+    tag: DivisionTag;
+    level: number;
+    headings: DivisionContent[];
+}
+export interface Article extends Division {
+    alineas: Alinea[];
+}
+export interface DivisionContent {
+    text: string | null;
+    html?: string | null;
+}
+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;
+    html: string | null;
+}

package/lib/src/rich_types/texte.js

@@ -0,0 +1,15 @@
+export var DivisionType;
+(function (DivisionType) {
+    DivisionType[DivisionType["tome"] = 1] = "tome";
+    DivisionType[DivisionType["part"] = 2] = "part";
+    DivisionType[DivisionType["book"] = 3] = "book";
+    DivisionType[DivisionType["title"] = 4] = "title";
+    DivisionType[DivisionType["subtitle"] = 5] = "subtitle";
+    DivisionType[DivisionType["chapter"] = 6] = "chapter";
+    DivisionType[DivisionType["section"] = 7] = "section";
+    DivisionType[DivisionType["subsection"] = 8] = "subsection";
+    DivisionType[DivisionType["paragraph"] = 9] = "paragraph";
+    DivisionType[DivisionType["article"] = 10] = "article";
+    DivisionType[DivisionType["alinea"] = 11] = "alinea";
+    DivisionType[DivisionType["division"] = 12] = "division";
+})(DivisionType || (DivisionType = {}));

package/lib/src/schemas/config.d.ts

@@ -0,0 +1,9 @@
+import { z } from "zod";
+export declare const configSchema: z.ZodObject<{
+    db: z.ZodObject<{
+        host: z.ZodString;
+        password: z.ZodString;
+        user: z.ZodString;
+        port: z.ZodCoercedNumber<unknown>;
+    }, z.core.$strip>;
+}, z.core.$strip>;

package/lib/src/schemas/config.js

@@ -0,0 +1,10 @@
+import { z } from "zod";
+const dbSchema = z.object({
+    host: z.string().trim().min(1, "Must not be empty"),
+    password: z.string().trim().min(1, "Must not be empty"),
+    user: z.string().trim().min(1, "Must not be empty"),
+    port: z.coerce.number().int().min(0).max(65535),
+});
+export const configSchema = z.object({
+    db: dbSchema,
+});

package/lib/src/scripts/convert_data.js

@@ -2,13 +2,13 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import path from "path";
 import pLimit from "p-limit";
-import * as git from "../git.js";
-import { datasets, EnabledDatasets, getEnabledDatasets } from "../datasets.js";
-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.js";
-import { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllDossiers, findAllScrutins, findAllOrganismes, findAllQuestions, findAllSens, findAllTextes, findAllRapports, } from "../model/index.js";
+import * as git from "../server/git.js";
+import { datasets, EnabledDatasets, getEnabledDatasets } from "../server/datasets.js";
+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 "../server/loaders.js";
+import { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllDossiers, findAllScrutins, findAllOrganismes, findAllQuestions, findAllSens, findAllTextes, findAllRapports, } from "../server/index.js";
 import { processRapport, processTexte } from "./retrieve_documents.js";
-import { buildActesLegislatifs } from "../model/dosleg.js";
-import { UNDEFINED_SESSION } from "../types/sessions.js";
+import { buildActesLegislatifs } from "../rich_types/dosleg.js";
+import { UNDEFINED_SESSION } from "../other_types/sessions.js";
 import { getSessionFromDate, getSessionFromSignet } from "./datautil.js";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
 import { ensureAndClearDir } from "./shared/util.js";

package/lib/src/scripts/convert_xml_to_html.js

@@ -1,7 +1,7 @@
 import fs from "fs-extra";
 import path from "path";
 import commandLineArgs from "command-line-args";
-import { convertSenatXmlToHtml } from "../conversion_textes.js";
+import { convertSenatXmlToHtml } from "../server/conversion_textes.js";
 const optionDefinitions = [
     { name: "input", alias: "i", type: String, defaultOption: true },
     { name: "output", alias: "o", type: String },

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

@@ -1,4 +1,4 @@
-import { Session } from "../types/sessions.js";
+import { Session } from "../other_types/sessions.js";
 export declare const STANDARD_DATE_FORMAT = "yyyy-MM-dd";
 export declare const ID_DATE_FORMAT = "yyyyMMdd";
 export declare const AKN_IDENTIFICATION_STRUCTURE_REGEXP: RegExp;

package/lib/src/scripts/retrieve_agenda.js

@@ -2,10 +2,10 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import { DateTime } from "luxon";
 import path from "path";
-import * as git from "../git.js";
-import { AGENDA_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders.js";
-import { parseAgendaFromFile } from "../model/agenda.js";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import * as git from "../server/git.js";
+import { AGENDA_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../server/loaders.js";
+import { parseAgendaFromFile } from "../server/agenda.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../other_types/sessions.js";
 import { ID_DATE_FORMAT } from "./datautil.js";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
 import { fetchWithRetry } from "./shared/util.js";

package/lib/src/scripts/retrieve_cr_commission.js

@@ -1,16 +1,16 @@
 import fs, { ensureDir } from "fs-extra";
 import path from "path";
 import * as cheerio from "cheerio";
-import { COMMISSION_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders.js";
+import { COMMISSION_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../server/loaders.js";
 import { loadAgendaForDate, parseCommissionMetadataFromHtml, linkCRtoCommissionGroup } from "../utils/cr_spliting.js";
-import { cleanTitle, extractDayH3Sections, parseCommissionCRSectionFromDom } from "../model/commission.js";
+import { cleanTitle, extractDayH3Sections, parseCommissionCRSectionFromDom } from "../server/commission.js";
 import commandLineArgs from "command-line-args";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
-import { sessionStartYearFromDate } from "../model/seance.js";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import { sessionStartYearFromDate } from "../server/seance.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../other_types/sessions.js";
 import { ensureAndClearDir, fetchWithRetry } from "./shared/util.js";
 import { jaccard, jaccardTokenSim } from "../utils/scoring.js";
-import * as git from "../git.js";
+import * as git from "../server/git.js";
 class CommissionCRDownloadError extends Error {
     constructor(message, url) {
         super(`An error occurred while retrieving Commission CR ${url}: ${message}`);
@@ -363,7 +363,7 @@ async function retrieveCommissionCRs(options = {}) {
     commitAndPushGit(debatsDir, options);
 }
 async function main() {
-    const dataDir = assertExistingDirectory(options["dataDir"], "data directory");
+    assertExistingDirectory(options["dataDir"], "data directory");
     console.time("CRI processing time");
     await retrieveCommissionCRs(options);
     console.timeEnd("CRI processing time");

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

@@ -3,7 +3,7 @@
  * - downloads the ZIP of comptes-rendus des débats (CRI) from data.senat.fr
  * - extracts XML files, distributes them by session/year
  */
-import { Session } from "../types/sessions.js";
+import { Session } from "../other_types/sessions.js";
 import { CommandLineOptions } from "command-line-args";
 type RetrieveCriOptions = CommandLineOptions & {
     commit?: boolean;

package/lib/src/scripts/retrieve_cr_seance.js

@@ -8,15 +8,15 @@ import fs, { ensureDirSync } from "fs-extra";
 import path from "path";
 import StreamZip from "node-stream-zip";
 import * as cheerio from "cheerio";
-import { AGENDA_FOLDER, COMPTES_RENDUS_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders.js";
+import { AGENDA_FOLDER, COMPTES_RENDUS_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, } from "../server/loaders.js";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
-import { parseCompteRenduIntervalFromFile, sessionStartYearFromDate } from "../model/seance.js";
+import { parseCompteRenduIntervalFromFile, sessionStartYearFromDate } from "../server/seance.js";
 import { extractSommaireBlocks, makeReunionUid } from "../utils/reunion_parsing.js";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../other_types/sessions.js";
 import { ensureAndClearDir, fetchWithRetry } from "./shared/util.js";
 import { isNoiseBlock, scoreSommaireBlockForEvent } from "../utils/scoring.js";
 import { parseYYYYMMDD } from "../utils/date.js";
-import * as git from "../git.js";
+import * as git from "../server/git.js";
 const optionsDefinitions = [
     ...commonOptions,
     {

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