@tricoteuses/senat 3.0.2 → 3.1.1

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

@@ -0,0 +1,212 @@
+import { 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 "../kanel_types/dosleg.js";
+import { TxtAmeli } from "../kanel_types/ameli.js";
+import { Debats } from "../kanel_types/debats.js";
+import { TxtAmeliCustomRich } from "./ameli.js";
+export interface DossierThemeRow {
+    libelle: string;
+}
+export type DossierAuteurRow = {
+    matricule: string | null;
+    nom_usuel: string;
+    ordre: string | null;
+    prenom: string | null;
+    qualite: string | null;
+    role: string | null;
+};
+export type DossierDocumentAnnexeRow = {
+    type_document: string;
+    url: string | null;
+};
+export type DossierTexte = {
+    auteurs?: DossierAuteurRow[] | null;
+    code_adoption?: string | null;
+    code_organisme?: string | null;
+    date?: string | null;
+    id?: string | null;
+    modification?: string | null;
+    numero?: number | string | null;
+    ordre_origine?: string | null;
+    origine?: string | null;
+    session?: number | null;
+    titre?: string | null;
+    type?: string | null;
+    url?: string | null;
+};
+export type DossierRapport = {
+    auteurs?: DossierAuteurRow[] | null;
+    code_organisme?: string | null;
+    date?: string | null;
+    documents_annexes?: DossierDocumentAnnexeRow[] | null;
+    id?: string | null;
+    numero?: number | string | null;
+    session?: number | null;
+    sous_titre?: string | null;
+    titre?: string | null;
+    type?: string | null;
+    url?: string | null;
+};
+export type DossierDateSeance = {
+    date?: string | null;
+};
+export type DossierLectureAssemblee = {
+    assemblee?: string | null;
+    code_organisme?: string | null;
+    date_publication_amendements_commission?: string | null;
+    date_publication_amendements_seance?: string | null;
+    dates_seances?: DossierDateSeance[] | null;
+    libelle_organisme?: string | null;
+    loi_intitule_modifie?: string | null;
+    numero_petite_loi?: number | null;
+    ordre_lecture_assemblee?: string | null;
+    origine_proposition?: string | null;
+    rapports?: DossierRapport[] | null;
+    session?: number | null;
+    textes?: DossierTexte[] | null;
+    url_cr_debats?: string | null;
+    url_petite_loi?: string | null;
+};
+export type DossierLecture = {
+    lectures_assemblee?: DossierLectureAssemblee[] | null;
+    libelle?: string | null;
+    ordre_lecture?: number | string | null;
+    type_lecture?: string | null;
+};
+export interface DossierLegislatifResult {
+    code: string | null;
+    code_dossier_an: string | null;
+    code_nature_dossier: string | null;
+    code_organisme_resolution: string | null;
+    condition_saisine_CoC: string | null;
+    date_decision_CoC: string | null;
+    date_opposition_procedure_acceleree: string | null;
+    date_procedure_acceleree: string | null;
+    date_publication_JO: string | null;
+    date_publication_JO_correctif_1: string | null;
+    date_publication_JO_correctif_2: string | null;
+    date_promulgation: string | null;
+    date_retrait_procedure_acceleree: string | null;
+    date_saisine_CoC: string | null;
+    etat_dossier: string | null;
+    lectures: DossierLecture[];
+    libelle_decision_CoC: string | null;
+    libelle_type_dossier: string | null;
+    mot_cle: string | null;
+    num_decision_CoC: string | null;
+    numero: string | null;
+    numero_JO: string | null;
+    numero_JO_correctif_1: string | null;
+    numero_JO_correctif_2: string | null;
+    signet: string;
+    signet_alternatif: string | null;
+    themes: DossierThemeRow[];
+    titre: string | null;
+    titre_JO: string;
+    titre_court: string | null;
+    titre_long: string | null;
+    titre_long_original: string | null;
+    urgence: string | null;
+    url: string;
+    url_JO: string | null;
+    url_JO_correctif_1: string | null;
+    url_JO_correctif_2: string | null;
+    url_decision_CoC: string | null;
+    url_dossier_assemblee_nationale: string | null;
+    url_dossier_CoC: string | null;
+    url_ordonnance: string | null;
+    url_presentation_articles: string | null;
+}
+export type DossierWithLectures = DossierLegislatifResult & {
+    actes_legislatifs?: ActeLegislatif[] | null;
+    lectures?: DossierLecture[] | null;
+    numero_JO?: string | number | null;
+    signet: string;
+    themes?: DossierThemeRow[] | null;
+    url_JO?: string | null;
+    url_decision_CoC?: string | null;
+    url_dossier_CoC?: string | null;
+};
+export type ActeLegislatif = {
+    adoption?: string;
+    chambre: "AN" | "SN";
+    code_acte: string;
+    code_organisme: string | null;
+    date: string;
+    date_publication_JO?: string | null;
+    id?: string | null;
+    libelle: string;
+    numero?: string | number | null;
+    numero_JO?: string | number | null;
+    session?: number | null;
+    signet_dossier: string;
+    texte_url?: string | null;
+    uid: string;
+    url_legifrance?: string | null;
+};
+export type { Deccoc as DecCoc, Denrap as DenRap, Etaloi as EtaLoi, Oritxt as OriTxt, Raporg as RapOrg, Typatt as TypAtt, Typlec as TypLec, Typloi as TypLoi, Typtxt as TypTxt, Typurl as TypUrl, };
+export interface AudRich extends Aud {
+    org?: Org;
+}
+export interface AuteurRich extends Auteur {
+    qua?: Qua;
+}
+export interface DateSeanceRich extends DateSeance {
+    debat?: Debats;
+    scrids?: string[];
+    scrs?: Scr[];
+}
+export interface DocAttRich extends Docatt {
+    rap?: Rap;
+    typatt?: Typatt;
+}
+export interface EcrRich extends Ecr {
+    aut?: AuteurRich;
+}
+export interface LecAssRich extends Lecass {
+    ass?: Ass;
+    auds?: AudRich[];
+    audcles?: Aud["audcle"][];
+    datesSeances?: DateSeanceRich[];
+    datesSeancesCodes?: DateSeance["code"][];
+    debatdatseas: Date[];
+    lecassraps?: LecAssRapRich[];
+    lecassrapids?: string[];
+    org?: Org;
+    texcods: Texte["texcod"][];
+    textes?: TexteRich[];
+}
+export interface LecAssRapRich extends Lecassrap {
+    rap?: Rap;
+}
+export interface LectureRich extends Lecture {
+    typlec?: Typlec;
+    lecassidts?: Lecass["lecassidt"][];
+    lecasss?: LecAssRich[];
+}
+export interface LoiRich extends Loi {
+    deccoc?: Deccoc;
+    etaloi?: Etaloi;
+    lecidts?: Lecture["lecidt"][];
+    lectures?: LectureRich[];
+    typloi?: Typloi;
+}
+export interface RapRich extends Rap {
+    denrap?: Denrap;
+    docattcles?: Docatt["docattcle"][];
+    docatts?: DocAttRich[];
+    ecrnums?: Ecr["ecrnum"][];
+    ecrs?: EcrRich[];
+    orgcods?: Raporg["orgcod"][];
+    orgs?: Org[];
+}
+export interface TexteRich extends Texte {
+    ecrs?: EcrRich[];
+    ecrnums?: Ecr["ecrnum"][];
+    libtypurl?: Typurl["libtypurl"];
+    org?: Org;
+    oritxt: Oritxt;
+    typtxt?: Typtxt;
+    txtAmeli?: TxtAmeliCustomRich;
+    txtAmeliId: TxtAmeli["id"];
+}
+export declare function getCodeActeLecture(codeNatureDossier: string, typeLecture: string, assemblee: string): string | null;
+export declare function buildActesLegislatifs(dossier: DossierWithLectures): ActeLegislatif[];

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/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/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,
     {