@tricoteuses/senat 3.0.2 → 3.1.1

package/lib/scripts/shared/cli_helpers.d.ts

@@ -1,95 +0,0 @@
-export declare const categoriesOption: {
-    alias: string;
-    defaultValue: string[];
-    help: string;
-    multiple: boolean;
-    name: string;
-    type: StringConstructor;
-};
-export declare const dataDirDefaultOption: {
-    defaultOption: boolean;
-    help: string;
-    name: string;
-    type: StringConstructor;
-};
-export declare const fromSessionOption: {
-    defaultValue: number;
-    help: string;
-    name: string;
-    type: NumberConstructor;
-};
-export declare const silentOption: {
-    alias: string;
-    help: string;
-    name: string;
-    type: BooleanConstructor;
-};
-export declare const verboseOption: {
-    alias: string;
-    help: string;
-    name: string;
-    type: BooleanConstructor;
-};
-export declare const onlyRecentOption: {
-    help: string;
-    name: string;
-    type: NumberConstructor;
-};
-export declare const keepDirOption: {
-    help: string;
-    name: string;
-    type: BooleanConstructor;
-};
-export declare const cloneOption: {
-    alias: string;
-    help: string;
-    name: string;
-    type: StringConstructor;
-};
-export declare const commitOption: {
-    help: string;
-    name: string;
-    type: BooleanConstructor;
-};
-export declare const remoteOption: {
-    alias: string;
-    help: string;
-    multiple: boolean;
-    name: string;
-    type: StringConstructor;
-};
-export declare const pullOption: {
-    alias: string;
-    help: string;
-    name: string;
-    type: BooleanConstructor;
-};
-export declare const fetchDocumentsOption: {
-    help: string;
-    name: string;
-    type: BooleanConstructor;
-};
-export declare const parseDocumentsOption: {
-    help: string;
-    name: string;
-    type: BooleanConstructor;
-};
-export declare const commonOptions: ({
-    defaultOption: boolean;
-    help: string;
-    name: string;
-    type: StringConstructor;
-} | {
-    help: string;
-    name: string;
-    type: NumberConstructor;
-} | {
-    help: string;
-    name: string;
-    type: BooleanConstructor;
-} | {
-    alias: string;
-    help: string;
-    name: string;
-    type: StringConstructor;
-})[];

package/lib/scripts/shared/cli_helpers.js

@@ -1,91 +0,0 @@
-export const categoriesOption = {
-    alias: "k",
-    defaultValue: ["All"],
-    help: "categories of datasets to reorganize; default All",
-    multiple: true,
-    name: "categories",
-    type: String,
-};
-export const dataDirDefaultOption = {
-    defaultOption: true,
-    help: "directory containing Sénat open data files",
-    name: "dataDir",
-    type: String,
-};
-export const fromSessionOption = {
-    defaultValue: 2022,
-    help: "session year to retrieve data from; default 2022",
-    name: "fromSession",
-    type: Number,
-};
-export const silentOption = {
-    alias: "s",
-    help: "don't log anything",
-    name: "silent",
-    type: Boolean,
-};
-export const verboseOption = {
-    alias: "v",
-    help: "verbose logs",
-    name: "verbose",
-    type: Boolean,
-};
-export const onlyRecentOption = {
-    help: "retrieve only documents created within the last N days (that are not already downloaded)",
-    name: "only-recent",
-    type: Number,
-};
-export const keepDirOption = {
-    help: "keep directories when cleaning data",
-    name: "keepDir",
-    type: Boolean,
-};
-export const cloneOption = {
-    alias: "C",
-    help: "clone repositories from given group (or organization) git URL",
-    name: "clone",
-    type: String,
-};
-export const commitOption = {
-    help: "commit clean files",
-    name: "commit",
-    type: Boolean,
-};
-export const remoteOption = {
-    alias: "r",
-    help: "push commit to given remote",
-    multiple: true,
-    name: "remote",
-    type: String,
-};
-export const pullOption = {
-    alias: "p",
-    help: "pull repositories before proceeding",
-    name: "pull",
-    type: Boolean,
-};
-export const fetchDocumentsOption = {
-    help: "download documents",
-    name: "fetchDocuments",
-    type: Boolean,
-};
-export const parseDocumentsOption = {
-    help: "parse documents",
-    name: "parseDocuments",
-    type: Boolean,
-};
-export const commonOptions = [
-    categoriesOption,
-    dataDirDefaultOption,
-    fromSessionOption,
-    silentOption,
-    verboseOption,
-    onlyRecentOption,
-    keepDirOption,
-    cloneOption,
-    commitOption,
-    remoteOption,
-    pullOption,
-    fetchDocumentsOption,
-    parseDocumentsOption,
-];

package/lib/scripts/shared/cli_helpers.ts

@@ -1,36 +0,0 @@
-export const categoriesOption = {
-  alias: "k",
-  defaultValue: ["All"],
-  help: "categories of datasets to reorganize",
-  multiple: true,
-  name: "categories",
-  type: String,
-}
-
-export const dataDirDefaultOption = {
-  defaultOption: true,
-  help: "directory containing Sénat open data files",
-  name: "dataDir",
-  type: String,
-}
-
-export const silentOption = {
-  alias: "s",
-  help: "don't log anything",
-  name: "silent",
-  type: Boolean,
-}
-
-export const verboseOption = {
-  alias: "v",
-  help: "verbose logs",
-  name: "verbose",
-  type: Boolean,
-}
-
-export const commonOptions = [
-  categoriesOption,
-  dataDirDefaultOption,
-  silentOption,
-  verboseOption,
-]

package/lib/scripts/shared/util.d.ts

@@ -1,4 +0,0 @@
-export declare function isOptionEmptyOrHasValue(option: string, value: string): boolean;
-export declare function ensureAndClearDirSync(dir: string): void;
-export declare function ensureAndClearDir(path: string): void;
-export declare function fetchWithRetry(url: string, retries?: number, backoff?: number): Promise<Response>;

package/lib/scripts/shared/util.js

@@ -1,35 +0,0 @@
-import fs from "fs-extra";
-import path from "path";
-export function isOptionEmptyOrHasValue(option, value) {
-    return !option || option.length === 0 || option.includes(value);
-}
-export function ensureAndClearDirSync(dir) {
-    fs.ensureDirSync(dir);
-    for (const name of fs.readdirSync(dir)) {
-        fs.rmSync(path.join(dir, name), { recursive: true, force: true });
-    }
-}
-export function ensureAndClearDir(path) {
-    if (!fs.existsSync(path)) {
-        fs.mkdirSync(path, { recursive: true });
-    }
-    else {
-        fs.emptyDirSync(path);
-    }
-}
-export async function fetchWithRetry(url, retries = 3, backoff = 300) {
-    for (let attempt = 0; attempt < retries; attempt++) {
-        try {
-            return await fetch(url);
-        }
-        catch (error) {
-            if (attempt === retries - 1) {
-                throw error;
-            }
-            console.warn(`Fetch attempt ${attempt + 1} for ${url} failed. Retrying in ${backoff}ms…`);
-            await new Promise((resolve) => setTimeout(resolve, backoff));
-            backoff *= 2;
-        }
-    }
-    throw new Error(`Failed to fetch ${url} after ${retries} attempts`);
-}

package/lib/scripts/shared/util.ts

@@ -1,33 +0,0 @@
-import fs from "fs-extra"
-
-export function isOptionEmptyOrHasValue (option: string, value: string) {
-  return !option || option.length === 0 || option.includes(value)
-}
-
-export function ensureAndClearDir (path: string) {
-  if (!fs.existsSync(path)) {
-    fs.mkdirSync(path, { recursive: true })
-  } else {
-    fs.emptyDirSync(path)
-  }
-}
-
-export async function fetchWithRetry (
-  url: string,
-  retries: number = 3,
-  backoff: number = 300,
-): Promise<Response> {
-  for (let attempt = 0; attempt < retries; attempt++) {
-    try {
-      return await fetch(url)
-    } catch (error) {
-      if (attempt === retries - 1) {
-        throw error
-      }
-      console.warn(`Fetch attempt ${attempt + 1} for ${url} failed. Retrying in ${backoff}ms…`)
-      await new Promise((resolve) => setTimeout(resolve, backoff))
-      backoff *= 2
-    }
-  }
-  throw new Error(`Failed to fetch ${url} after ${retries} attempts`)
-}

package/lib/scripts/test_iter_load.d.ts

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

package/lib/scripts/test_iter_load.js

@@ -1,12 +0,0 @@
-import { iterLoadSenatRapports } from "../loaders";
-import commandLineArgs from "command-line-args";
-import { dataDirDefaultOption } from "./shared/cli_helpers";
-const optionsDefinitions = [dataDirDefaultOption];
-const options = commandLineArgs(optionsDefinitions);
-const session = 2024;
-const sinceCommit = undefined;
-for (const { item: rapport } of iterLoadSenatRapports(options["dataDir"], session, {
-    sinceCommit: sinceCommit,
-})) {
-    console.log(rapport);
-}

package/lib/src/databases.d.ts

@@ -1,3 +0,0 @@
-import { Kysely } from "kysely";
-import type { LooseKyselyDatabase } from "./typings/kysely-loose";
-export declare const dbSenat: Kysely<LooseKyselyDatabase>;

package/lib/src/databases.js

@@ -1,26 +0,0 @@
-import { Kysely, PostgresDialect } from "kysely";
-import * as pg from "pg";
-import { types } from "pg";
-import Cursor from "pg-cursor";
-import config from "./config";
-// Map int8 to number instead of string
-// https://github.com/brianc/node-pg-types#use
-pg.types.setTypeParser(types.builtins.INT8, (val) => {
-    return parseInt(val, 10);
-});
-const senatPool = new pg.Pool({
-    database: "senat",
-    host: config.db.host,
-    user: config.db.user,
-    password: config.db.password,
-    port: config.db.port,
-    max: 10,
-});
-const senatDialect = new PostgresDialect({
-    pool: senatPool,
-    cursor: Cursor,
-});
-export const dbSenat = new Kysely({
-    log: ["error"],
-    dialect: senatDialect,
-});

package/lib/src/model/ameli_postgres.js

@@ -1,150 +0,0 @@
-import { streamUnsafeQuery } from "../databases_postgres";
-function buildFindAllAmendementsQuery(fromSession) {
-    const params = [];
-    const whereSession = fromSession === undefined ? "" : "where ameli.ses.ann >= $1";
-    if (fromSession !== undefined) {
-        params.push(String(fromSession));
-    }
-    return {
-        params,
-        query: `
-    select
-      ameli.ses.ann::text as session,
-      ameli.ses.lil as session_libelle,
-      ameli.typses.lib as type_session,
-      ameli.txt_ameli.doslegsignet as signet_dossier_legislatif,
-      ameli.nat.libcourt as nature_texte,
-      ameli.nat.lib as nature_texte_libelle,
-      ameli.txt_ameli.numabs as numero_texte,
-      ameli.txt_ameli.numado as numero_adoption_texte,
-      ameli.txt_ameli.int as intitule_texte,
-      ameli.etatxt.lic as etat_texte,
-      ameli.etatxt.lib as etat_texte_libelle,
-      ameli.etatxt.txttyp as type_texte,
-      ameli.lec_ameli.lib as lecture,
-      case ameli.amd.typ
-        when 'A' then 'Amendement'
-        when 'M' then 'Motion'
-        when 'S' then 'Sous-amendement'
-        else ''
-      end as nature,
-      ameli.amd.id,
-      ameli.amd.amdperid as parent_id,
-      ameli.amd.ideid as identique_id,
-      ameli.amd.discomid as discussion_commune_id,
-      ameli.amd.num as numero,
-      ameli.amd.numabs as numero_absolu,
-      ameli.amd.ord as ordre,
-      ameli.amd.accgou as accepte_gouvernement,
-      ameli.amd.txtid as texte_id,
-      ameli.sub.lib as subdivision_libelle,
-      ameli.sub.lic as subdivision_libelle_court,
-      ameli.sub.pos as subdivision_position_texte,
-      ameli.sub.posder as subdivision_position_discussion,
-      ameli.sub.merid as subdivision_mere_id,
-      ameli.sub.sig as subdivision_signet,
-      ameli.sub.comdelid as subdivision_commission_id,
-      ameli.sub.dupl as subdivision_dupliquee,
-      ameli.typsub.lib as subdivision_type,
-      ameli.amd.alinea,
-      ameli.amd.obs as observations,
-      ameli.amd.mot as observations_additionnelles,
-      to_char(ameli.amd.datdep, 'YYYY-MM-DD') as date_depot,
-      ameli.amd.dis as dispositif,
-      ameli.amd.obj as objet,
-      ameli.typrect.lib as type_rectification,
-      ameli.mot.lib as motion_libelle,
-      case ameli.amd.etaid
-        when 7 then 'Diffusé'
-        when 8 then 'Retiré avant réunion ou séance'
-        when 9 then 'Examiné en commission ou séance'
-        when 10 then 'Irrecevable'
-        when 11 then 'Irrecevable'
-        else ''
-      end as etat,
-      ameli.avicom.lib as avis_commission,
-      ameli.avigvt.lib as avis_gouvernement,
-      coalesce(ameli.sor.lib, ameli.irr.libirr) as sort,
-      ameli.amd.rev as revision,
-      (
-        case
-          when ameli.amd.num like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
-          else 'https://www.senat.fr/amendements/'
-        end ||
-        ameli.ses.ann::text || '-' ||
-        (ameli.ses.ann + 1)::text || '/' ||
-        ameli.txt_ameli.numabs || '/Amdt_' ||
-        ameli.amd.num || '.html'
-      ) as url,
-      ameli.grppol_ameli.lilcou as au_nom_de_groupe_politique,
-      rtrim(ameli.com_ameli.lil) as au_nom_de_commission,
-      rtrim(ameli.com_ameli.cod) as code_commission,
-      (ameli.cab.entid is not null) as auteur_est_gouvernement,
-      (
-        select dosleg.amescr.scrnum::text
-        from dosleg.amescr
-        left join dosleg.scr
-          on dosleg.amescr.scrnum = dosleg.scr.scrnum
-         and dosleg.amescr.sesann = dosleg.scr.sesann
-        left join dosleg.date_seance on dosleg.scr.code = dosleg.date_seance.code
-        where dosleg.amescr.amescrnum = ameli.amd.num
-          and dosleg.amescr.sesann = ameli.ses.ann
-          and dosleg.date_seance.lecidt = dosleg.texte.lecassidt
-        limit 1
-      ) as scrutin_num,
-      (
-        select coalesce(json_agg(author_rows order by author_rows.rang nulls last), '[]'::json)
-        from (
-          select
-            ameli.amdsen.prenomuse as prenom,
-            ameli.amdsen.hom as homonyme,
-            ameli.amdsen.nomuse as nom,
-            ameli.amdsen.qua as qualite,
-            ameli.amdsen.rng::text as rang,
-            ameli.sen_ameli.mat as matricule,
-            ameli.amdsen.grpid as groupe_politique_id,
-            ameli.grppol_ameli.cod as group_politique_code,
-            ameli.grppol_ameli.libcou as groupe_politique_libelle_court,
-            ameli.grppol_ameli.lilcou as groupe_politique_libelle
-          from ameli.amdsen
-          left join ameli.sen_ameli on ameli.amdsen.senid = ameli.sen_ameli.entid
-          left join ameli.grppol_ameli on ameli.amdsen.grpid = ameli.grppol_ameli.entid
-          where ameli.amdsen.amdid = ameli.amd.id
-          order by ameli.amdsen.rng asc
-        ) as author_rows
-      ) as auteurs
-    from ameli.amd
-    left join ameli.sub on ameli.amd.subid = ameli.sub.id
-    left join ameli.typsub on ameli.sub.typid = ameli.typsub.id
-    left join ameli.typrect on ameli.amd.typrectid = ameli.typrect.id
-    left join ameli.txt_ameli on ameli.amd.txtid = ameli.txt_ameli.id
-    left join ameli.etatxt on ameli.txt_ameli.txtetaid = ameli.etatxt.id
-    left join ameli.ses on ameli.txt_ameli.sesdepid = ameli.ses.id
-    left join ameli.typses on ameli.typses.id = ameli.ses.typid
-    left join ameli.nat on ameli.txt_ameli.natid = ameli.nat.id
-    left join ameli.lec_ameli on ameli.txt_ameli.lecid = ameli.lec_ameli.id
-    left join dosleg.texte
-      on ameli.ses.ann::text = dosleg.texte.sesann
-     and ameli.txt_ameli.numabs = dosleg.texte.texnum
-    left join dosleg.lecass on dosleg.texte.lecassidt = dosleg.lecass.lecassidt
-    left join ameli.mot on ameli.amd.motid = ameli.mot.id
-    left join ameli.avicom on ameli.amd.avcid = ameli.avicom.id
-    left join ameli.avigvt on ameli.amd.avgid = ameli.avigvt.id
-    left join ameli.sor on ameli.amd.sorid = ameli.sor.id
-    left join ameli.irr on ameli.amd.irrid = ameli.irr.id
-    left join ameli.grppol_ameli on ameli.amd.nomentid = ameli.grppol_ameli.entid
-    left join ameli.com_ameli on ameli.amd.nomentid = ameli.com_ameli.entid
-    left join ameli.cab on ameli.amd.nomentid = ameli.cab.entid
-    ${whereSession}
-  `,
-    };
-}
-export async function* findAllAmendementsPostgres(fromSession) {
-    const { query, params } = buildFindAllAmendementsQuery(fromSession);
-    for await (const row of streamUnsafeQuery(query, params)) {
-        yield {
-            ...row,
-            auteurs: row.auteurs ?? [],
-        };
-    }
-}