@tricoteuses/senat 1.3.2 → 1.3.5

package/lib/config.js

@@ -1,7 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("dotenv/config");
-const config_1 = require("./validators/config");
+import "dotenv/config";
+import { validateConfig } from "./validators/config";
 const config = {
     db: {
         host: process.env["TRICOTEUSES_SENAT_DB_HOST"] || "localhost",
@@ -10,9 +8,9 @@ const config = {
         user: process.env["TRICOTEUSES_SENAT_DB_USER"] || "opendata",
     },
 };
-const [validConfig, error] = (0, config_1.validateConfig)(config);
+const [validConfig, error] = validateConfig(config);
 if (error !== null) {
     console.error(`Error in configuration:\n${JSON.stringify(validConfig, null, 2)}\nError:\n${JSON.stringify(error, null, 2)}`);
     process.exit(-1);
 }
-exports.default = validConfig;
+export default validConfig;

package/lib/databases.js

@@ -1,98 +1,57 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dbSharedConnectionObjectByName = exports.dbSens = exports.dbQuestions = exports.dbDosleg = exports.dbAmeli = exports.dbByName = exports.dbNames = exports.pgPromise = void 0;
-exports.checkDatabase = checkDatabase;
-exports.checkDatabases = checkDatabases;
-const kysely_1 = require("kysely");
-const pg = __importStar(require("pg"));
-const pg_1 = require("pg");
-const pg_cursor_1 = __importDefault(require("pg-cursor"));
-const pg_promise_1 = __importDefault(require("pg-promise"));
-const config_1 = __importDefault(require("./config"));
-const datasets_1 = require("./datasets");
+import { Kysely, PostgresDialect } from "kysely";
+import * as pg from "pg";
+import { types } from "pg";
+import Cursor from "pg-cursor";
+import PgPromise from "pg-promise";
+import config from "./config";
+import { datasets } from "./datasets";
 // Map int8 to number instead of string
 // https://github.com/brianc/node-pg-types#use
-pg.types.setTypeParser(pg_1.types.builtins.INT8, (val) => {
+pg.types.setTypeParser(types.builtins.INT8, (val) => {
     return parseInt(val, 10);
 });
-exports.pgPromise = (0, pg_promise_1.default)();
-exports.dbNames = ["ameli", "debats", "dosleg"];
-exports.dbByName = {};
-for (const name of exports.dbNames) {
-    exports.dbByName[name] = (0, exports.pgPromise)({
+export const pgPromise = PgPromise();
+export const dbNames = ["ameli", "debats", "dosleg"];
+export const dbByName = {};
+for (const name of dbNames) {
+    dbByName[name] = pgPromise({
         database: name,
-        host: config_1.default.db.host,
-        password: config_1.default.db.password,
-        port: config_1.default.db.port,
-        user: config_1.default.db.user,
+        host: config.db.host,
+        password: config.db.password,
+        port: config.db.port,
+        user: config.db.user,
     });
 }
 function createDb(database, schema) {
-    const dialect = new kysely_1.PostgresDialect({
+    const dialect = new PostgresDialect({
         pool: new pg.Pool({
             database: database,
-            host: config_1.default.db.host,
-            user: config_1.default.db.user,
-            password: config_1.default.db.password,
-            port: config_1.default.db.port,
+            host: config.db.host,
+            user: config.db.user,
+            password: config.db.password,
+            port: config.db.port,
             max: 10,
         }),
-        cursor: pg_cursor_1.default,
+        cursor: Cursor,
     });
-    return new kysely_1.Kysely({
+    return new Kysely({
         log: ["error"],
         dialect: dialect,
     }).withSchema(schema);
 }
-exports.dbAmeli = createDb(datasets_1.datasets.ameli.database, datasets_1.datasets.ameli.schema);
-exports.dbDosleg = createDb(datasets_1.datasets.dosleg.database, datasets_1.datasets.dosleg.schema);
-exports.dbQuestions = createDb(datasets_1.datasets.questions.database, datasets_1.datasets.questions.schema);
-exports.dbSens = createDb(datasets_1.datasets.sens.database, datasets_1.datasets.sens.schema);
-exports.dbSharedConnectionObjectByName = {};
-async function checkDatabase(name) {
+export const dbAmeli = createDb(datasets.ameli.database, datasets.ameli.schema);
+export const dbDosleg = createDb(datasets.dosleg.database, datasets.dosleg.schema);
+export const dbQuestions = createDb(datasets.questions.database, datasets.questions.schema);
+export const dbSens = createDb(datasets.sens.database, datasets.sens.schema);
+export let dbSharedConnectionObjectByName = {};
+export async function checkDatabase(name) {
     // Check that database exists.
-    const db = exports.dbByName[name];
-    exports.dbSharedConnectionObjectByName[name] = await db.connect();
+    const db = dbByName[name];
+    dbSharedConnectionObjectByName[name] = await db.connect();
     return db;
 }
-async function checkDatabases() {
-    for (const name of exports.dbNames) {
+export async function checkDatabases() {
+    for (const name of dbNames) {
         await checkDatabase(name);
     }
 }

package/lib/datasets.js

@@ -1,15 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.datasets = exports.EnabledDatasets = void 0;
-exports.getEnabledDatasets = getEnabledDatasets;
-exports.getChosenFromEnabledDatasets = getChosenFromEnabledDatasets;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const assert_1 = __importDefault(require("assert"));
-var EnabledDatasets;
+import fs from "fs-extra";
+import path from "path";
+import assert from "assert";
+export var EnabledDatasets;
 (function (EnabledDatasets) {
     EnabledDatasets[EnabledDatasets["None"] = 0] = "None";
     EnabledDatasets[EnabledDatasets["Ameli"] = 1] = "Ameli";
@@ -19,16 +11,16 @@ var EnabledDatasets;
     EnabledDatasets[EnabledDatasets["Sens"] = 16] = "Sens";
     EnabledDatasets[EnabledDatasets["PhotosSenateurs"] = 32] = "PhotosSenateurs";
     EnabledDatasets[EnabledDatasets["All"] = 63] = "All";
-})(EnabledDatasets || (exports.EnabledDatasets = EnabledDatasets = {}));
-exports.datasets = {
+})(EnabledDatasets || (EnabledDatasets = {}));
+export const datasets = {
     ameli: {
         database: "ameli",
         repairEncoding: false,
         repairZip: (dataset, dataDir) => {
             const sqlFilename = `${dataset.database}.sql`;
-            const sqlFilePath = path_1.default.join(dataDir, sqlFilename);
-            fs_extra_1.default.removeSync(sqlFilePath);
-            fs_extra_1.default.moveSync(path_1.default.join(dataDir, "var", "opt", "opendata", sqlFilename), sqlFilePath);
+            const sqlFilePath = path.join(dataDir, sqlFilename);
+            fs.removeSync(sqlFilePath);
+            fs.moveSync(path.join(dataDir, "var", "opt", "opendata", sqlFilename), sqlFilePath);
         },
         schema: "public",
         title: "Amendements",
@@ -60,29 +52,29 @@ exports.datasets = {
         repairEncoding: true,
         repairZip: (dataset, dataDir) => {
             const sqlFilename = `${dataset.database}.sql`;
-            const sqlFilePath = path_1.default.join(dataDir, sqlFilename);
-            fs_extra_1.default.removeSync(sqlFilePath);
-            fs_extra_1.default.moveSync(path_1.default.join(dataDir, "export_sens.sql"), sqlFilePath);
+            const sqlFilePath = path.join(dataDir, sqlFilename);
+            fs.removeSync(sqlFilePath);
+            fs.moveSync(path.join(dataDir, "export_sens.sql"), sqlFilePath);
         },
         schema: "public",
         title: "Sénateurs (y compris organes et présence)",
         url: "https://data.senat.fr/data/senateurs/export_sens.zip",
     },
 };
-function getEnabledDatasets(categories) {
-    categories.map((datasetName) => assert_1.default.notStrictEqual(EnabledDatasets[datasetName], undefined, `Unknown name of dataset: ${datasetName}`));
+export function getEnabledDatasets(categories) {
+    categories.map((datasetName) => assert.notStrictEqual(EnabledDatasets[datasetName], undefined, `Unknown name of dataset: ${datasetName}`));
     return categories.reduce((enabledDatasets, datasetName) => {
         const enabledDataset = EnabledDatasets[datasetName];
         return enabledDatasets | (enabledDataset || EnabledDatasets.None);
     }, EnabledDatasets.None);
 }
-function getChosenFromEnabledDatasets(categories) {
+export function getChosenFromEnabledDatasets(categories) {
     const enabledDatasets = getEnabledDatasets(categories);
     return [
-        enabledDatasets & EnabledDatasets.Ameli ? exports.datasets.ameli : null,
-        enabledDatasets & EnabledDatasets.Debats ? exports.datasets.debats : null,
-        enabledDatasets & EnabledDatasets.DosLeg ? exports.datasets.dosleg : null,
-        enabledDatasets & EnabledDatasets.Questions ? exports.datasets.questions : null,
-        enabledDatasets & EnabledDatasets.Sens ? exports.datasets.sens : null,
+        enabledDatasets & EnabledDatasets.Ameli ? datasets.ameli : null,
+        enabledDatasets & EnabledDatasets.Debats ? datasets.debats : null,
+        enabledDatasets & EnabledDatasets.DosLeg ? datasets.dosleg : null,
+        enabledDatasets & EnabledDatasets.Questions ? datasets.questions : null,
+        enabledDatasets & EnabledDatasets.Sens ? datasets.sens : null,
     ].filter((dataset) => dataset !== null);
 }

package/lib/index.d.ts

@@ -1,3 +1,7 @@
+export type { AmendementResult, } from "./model/ameli";
+export type { DossierLegislatifResult, } from "./model/dosleg";
+export type { QuestionResult, } from "./model/questions";
+export type { CirconscriptionResult, OrganismeResult, SenateurResult, } from "./model/sens";
 export { sesFieldsToParseInt, sesFieldsToTrim, subFieldsToParseInt, subFieldsToTrim, txtAmeliFieldsToTrim, } from "./types/ameli";
 export type { Ses, Sub, TxtAmeli } from "./types/ameli";
 export { debatsFieldsToTrim, lecassdebFieldsToTrim } from "./types/debats";
@@ -6,3 +10,4 @@ export { assFieldsToTrim, audFieldsToTrim, auteurFieldsToTrim, dateSeanceFieldsT
 export type { 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 "./types/dosleg";
 export type { Photo, Sen } from "./types/sens";
 export { Session } from "./types/sessions";
+export type { Alinea, Article, Division, DivisionTag, FlatTexte } from "./types/texte";

package/lib/index.js

@@ -1,43 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Session = exports.typurlFieldsToTrim = exports.typtxtFieldsToTrim = exports.typloiFieldsToTrim = exports.typlecFieldsToTrim = exports.typattFieldsToTrim = exports.texteFieldsToTrim = exports.texteFieldsToParseInt = exports.scrFieldsToTrim = exports.raporgFieldsToTrim = exports.rapFieldsToTrim = exports.rapFieldsToParseInt = exports.quaFieldsToTrim = exports.oritxtFieldsToTrim = exports.orgFieldsToTrim = exports.loiFieldsToTrim = exports.lectureFieldsToTrim = exports.lecassrapFieldsToTrim = exports.lecassFieldsToTrim = exports.etaloiFieldsToTrim = exports.ecrFieldsToTrim = exports.docattFieldsToTrim = exports.docattFieldsToParseInt = exports.denrapFieldsToTrim = exports.deccocFieldsToTrim = exports.dateSeanceFieldsToTrim = exports.auteurFieldsToTrim = exports.audFieldsToTrim = exports.assFieldsToTrim = exports.lecassdebFieldsToTrim = exports.debatsFieldsToTrim = exports.txtAmeliFieldsToTrim = exports.subFieldsToTrim = exports.subFieldsToParseInt = exports.sesFieldsToTrim = exports.sesFieldsToParseInt = void 0;
-var ameli_1 = require("./types/ameli");
-Object.defineProperty(exports, "sesFieldsToParseInt", { enumerable: true, get: function () { return ameli_1.sesFieldsToParseInt; } });
-Object.defineProperty(exports, "sesFieldsToTrim", { enumerable: true, get: function () { return ameli_1.sesFieldsToTrim; } });
-Object.defineProperty(exports, "subFieldsToParseInt", { enumerable: true, get: function () { return ameli_1.subFieldsToParseInt; } });
-Object.defineProperty(exports, "subFieldsToTrim", { enumerable: true, get: function () { return ameli_1.subFieldsToTrim; } });
-Object.defineProperty(exports, "txtAmeliFieldsToTrim", { enumerable: true, get: function () { return ameli_1.txtAmeliFieldsToTrim; } });
-var debats_1 = require("./types/debats");
-Object.defineProperty(exports, "debatsFieldsToTrim", { enumerable: true, get: function () { return debats_1.debatsFieldsToTrim; } });
-Object.defineProperty(exports, "lecassdebFieldsToTrim", { enumerable: true, get: function () { return debats_1.lecassdebFieldsToTrim; } });
-var dosleg_1 = require("./types/dosleg");
-Object.defineProperty(exports, "assFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.assFieldsToTrim; } });
-Object.defineProperty(exports, "audFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.audFieldsToTrim; } });
-Object.defineProperty(exports, "auteurFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.auteurFieldsToTrim; } });
-Object.defineProperty(exports, "dateSeanceFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.dateSeanceFieldsToTrim; } });
-Object.defineProperty(exports, "deccocFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.deccocFieldsToTrim; } });
-Object.defineProperty(exports, "denrapFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.denrapFieldsToTrim; } });
-Object.defineProperty(exports, "docattFieldsToParseInt", { enumerable: true, get: function () { return dosleg_1.docattFieldsToParseInt; } });
-Object.defineProperty(exports, "docattFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.docattFieldsToTrim; } });
-Object.defineProperty(exports, "ecrFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.ecrFieldsToTrim; } });
-Object.defineProperty(exports, "etaloiFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.etaloiFieldsToTrim; } });
-Object.defineProperty(exports, "lecassFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.lecassFieldsToTrim; } });
-Object.defineProperty(exports, "lecassrapFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.lecassrapFieldsToTrim; } });
-Object.defineProperty(exports, "lectureFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.lectureFieldsToTrim; } });
-Object.defineProperty(exports, "loiFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.loiFieldsToTrim; } });
-Object.defineProperty(exports, "orgFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.orgFieldsToTrim; } });
-Object.defineProperty(exports, "oritxtFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.oritxtFieldsToTrim; } });
-Object.defineProperty(exports, "quaFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.quaFieldsToTrim; } });
-Object.defineProperty(exports, "rapFieldsToParseInt", { enumerable: true, get: function () { return dosleg_1.rapFieldsToParseInt; } });
-Object.defineProperty(exports, "rapFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.rapFieldsToTrim; } });
-Object.defineProperty(exports, "raporgFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.raporgFieldsToTrim; } });
-Object.defineProperty(exports, "scrFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.scrFieldsToTrim; } });
-Object.defineProperty(exports, "texteFieldsToParseInt", { enumerable: true, get: function () { return dosleg_1.texteFieldsToParseInt; } });
-Object.defineProperty(exports, "texteFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.texteFieldsToTrim; } });
-Object.defineProperty(exports, "typattFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.typattFieldsToTrim; } });
-Object.defineProperty(exports, "typlecFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.typlecFieldsToTrim; } });
-Object.defineProperty(exports, "typloiFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.typloiFieldsToTrim; } });
-Object.defineProperty(exports, "typtxtFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.typtxtFieldsToTrim; } });
-Object.defineProperty(exports, "typurlFieldsToTrim", { enumerable: true, get: function () { return dosleg_1.typurlFieldsToTrim; } });
-var sessions_1 = require("./types/sessions");
-Object.defineProperty(exports, "Session", { enumerable: true, get: function () { return sessions_1.Session; } });
+export { sesFieldsToParseInt, sesFieldsToTrim, subFieldsToParseInt, subFieldsToTrim, txtAmeliFieldsToTrim, } from "./types/ameli";
+export { debatsFieldsToTrim, lecassdebFieldsToTrim } from "./types/debats";
+export { assFieldsToTrim, audFieldsToTrim, auteurFieldsToTrim, dateSeanceFieldsToTrim, deccocFieldsToTrim, denrapFieldsToTrim, docattFieldsToParseInt, docattFieldsToTrim, ecrFieldsToTrim, etaloiFieldsToTrim, lecassFieldsToTrim, lecassrapFieldsToTrim, lectureFieldsToTrim, loiFieldsToTrim, orgFieldsToTrim, oritxtFieldsToTrim, quaFieldsToTrim, rapFieldsToParseInt, rapFieldsToTrim, raporgFieldsToTrim, scrFieldsToTrim, texteFieldsToParseInt, texteFieldsToTrim, typattFieldsToTrim, typlecFieldsToTrim, typloiFieldsToTrim, typtxtFieldsToTrim, typurlFieldsToTrim, } from "./types/dosleg";
+export { Session } from "./types/sessions";

package/lib/loaders.js

@@ -1,62 +1,44 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RAPPORT_FOLDER = exports.DOCUMENT_METADATA_FILE = exports.TEXTE_TRANSFORMED_FOLDER = exports.TEXTE_ORIGINAL_FOLDER = exports.TEXTE_FOLDER = exports.SENS_SENATEURS_FOLDER = exports.SENS_ORGANISMES_FOLDER = exports.SENS_CIRCONSCRIPTIONS_FOLDER = exports.DOSLEG_DOSSIERS_FOLDER = exports.EnabledDatasets = void 0;
-exports.iterFilePaths = iterFilePaths;
-exports.iterLoadSenatAmendements = iterLoadSenatAmendements;
-exports.iterLoadSenatDossiersLegislatifs = iterLoadSenatDossiersLegislatifs;
-exports.iterLoadSenatDossiersLegislatifsTexteUrls = iterLoadSenatDossiersLegislatifsTexteUrls;
-exports.iterLoadSenatDossiersLegislatifsRapportUrls = iterLoadSenatDossiersLegislatifsRapportUrls;
-exports.iterLoadSenatDossiersLegislatifsTextes = iterLoadSenatDossiersLegislatifsTextes;
-exports.loadSenatTexteContent = loadSenatTexteContent;
-exports.iterLoadSenatOrganismes = iterLoadSenatOrganismes;
-exports.iterLoadSenatSenateurs = iterLoadSenatSenateurs;
-exports.iterLoadSenatCirconscriptions = iterLoadSenatCirconscriptions;
-exports.iterLoadSenatQuestions = iterLoadSenatQuestions;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const legislatures_json_1 = __importDefault(require("./legislatures.json"));
-const datasets_1 = require("./datasets");
-const datautil_1 = require("./scripts/datautil");
-var datasets_2 = require("./datasets");
-Object.defineProperty(exports, "EnabledDatasets", { enumerable: true, get: function () { return datasets_2.EnabledDatasets; } });
-exports.DOSLEG_DOSSIERS_FOLDER = "dossiers";
-exports.SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
-exports.SENS_ORGANISMES_FOLDER = "organismes";
-exports.SENS_SENATEURS_FOLDER = "senateurs";
-exports.TEXTE_FOLDER = "leg";
-exports.TEXTE_ORIGINAL_FOLDER = "original";
-exports.TEXTE_TRANSFORMED_FOLDER = "transformed";
-exports.DOCUMENT_METADATA_FILE = "metadata.json";
-exports.RAPPORT_FOLDER = "rap";
-function* iterFilePaths(dirPath) {
-    if (dirPath && fs_1.default.existsSync(dirPath)) {
-        const files = fs_1.default.readdirSync(dirPath, {
+import fs from "fs";
+import path from "path";
+import legislatures from "./legislatures.json";
+import { datasets } from "./datasets";
+import { UNDEFINED_SESSION } from "./scripts/datautil";
+export { EnabledDatasets } from "./datasets";
+export const DOSLEG_DOSSIERS_FOLDER = "dossiers";
+export const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
+export const SENS_ORGANISMES_FOLDER = "organismes";
+export const SENS_SENATEURS_FOLDER = "senateurs";
+export const TEXTE_FOLDER = "leg";
+export const TEXTE_ORIGINAL_FOLDER = "original";
+export const TEXTE_TRANSFORMED_FOLDER = "transformed";
+export const DOCUMENT_METADATA_FILE = "metadata.json";
+export const RAPPORT_FOLDER = "rap";
+export function* iterFilePaths(dirPath) {
+    if (dirPath && fs.existsSync(dirPath)) {
+        const files = fs.readdirSync(dirPath, {
             withFileTypes: true,
             recursive: true,
         });
         for (const file of files) {
             if (file.isFile()) {
-                yield path_1.default.join(file.parentPath, file.name);
+                yield path.join(file.parentPath, file.name);
             }
         }
     }
 }
 function* iterLoadSenatItems(dataDir, dataset, legislatureOrSession, subDir, { log = false } = {}) {
-    let itemsDir = path_1.default.join(dataDir, dataset.database);
+    let itemsDir = path.join(dataDir, dataset.database);
     if (subDir) {
-        itemsDir = path_1.default.join(itemsDir, subDir);
+        itemsDir = path.join(itemsDir, subDir);
     }
     if (legislatureOrSession) {
-        itemsDir = path_1.default.join(itemsDir, String(legislatureOrSession));
+        itemsDir = path.join(itemsDir, String(legislatureOrSession));
     }
     for (const filePath of iterFilePaths(itemsDir)) {
         if (log) {
             console.log(`Loading file: ${filePath}…`);
         }
-        const itemJson = fs_1.default.readFileSync(filePath, { encoding: "utf8" });
+        const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
         const item = JSON.parse(itemJson);
         const filePathFromDataset = filePath.substring(filePath.indexOf(dataset.database) + dataset.database.length);
         yield {
@@ -66,25 +48,25 @@ function* iterLoadSenatItems(dataDir, dataset, legislatureOrSession, subDir, { l
         };
     }
 }
-function* iterLoadSenatAmendements(dataDir, session, options = {}) {
-    for (const amendementItem of iterLoadSenatItems(dataDir, datasets_1.datasets.ameli, session, undefined, options)) {
+export function* iterLoadSenatAmendements(dataDir, session, options = {}) {
+    for (const amendementItem of iterLoadSenatItems(dataDir, datasets.ameli, session, undefined, options)) {
         yield amendementItem;
     }
 }
-function* iterLoadSenatDossiersLegislatifs(dataDir, session, options = {}) {
-    for (const dossierLegislatifItem of iterLoadSenatItems(dataDir, datasets_1.datasets.dosleg, session, exports.DOSLEG_DOSSIERS_FOLDER, options)) {
+export function* iterLoadSenatDossiersLegislatifs(dataDir, session, options = {}) {
+    for (const dossierLegislatifItem of iterLoadSenatItems(dataDir, datasets.dosleg, session, DOSLEG_DOSSIERS_FOLDER, options)) {
         yield dossierLegislatifItem;
     }
 }
-function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
-    let itemsDir = path_1.default.join(dataDir, exports.TEXTE_FOLDER, exports.TEXTE_ORIGINAL_FOLDER);
+export function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
+    let itemsDir = path.join(dataDir, TEXTE_FOLDER, TEXTE_ORIGINAL_FOLDER);
     if (session) {
-        itemsDir = path_1.default.join(itemsDir, session.toString());
+        itemsDir = path.join(itemsDir, session.toString());
     }
     for (const filePath of iterFilePaths(itemsDir)) {
-        const parsedFilePath = path_1.default.parse(filePath);
-        if (parsedFilePath.base === exports.DOCUMENT_METADATA_FILE) {
-            const itemJson = fs_1.default.readFileSync(filePath, { encoding: "utf8" });
+        const parsedFilePath = path.parse(filePath);
+        if (parsedFilePath.base === DOCUMENT_METADATA_FILE) {
+            const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
             const item = JSON.parse(itemJson);
             yield {
                 item,
@@ -92,15 +74,15 @@ function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
         }
     }
 }
-function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
-    let itemsDir = path_1.default.join(dataDir, exports.RAPPORT_FOLDER);
+export function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
+    let itemsDir = path.join(dataDir, RAPPORT_FOLDER);
     if (session) {
-        itemsDir = path_1.default.join(itemsDir, session.toString());
+        itemsDir = path.join(itemsDir, session.toString());
     }
     for (const filePath of iterFilePaths(itemsDir)) {
-        const parsedFilePath = path_1.default.parse(filePath);
-        if (parsedFilePath.base === exports.DOCUMENT_METADATA_FILE) {
-            const itemJson = fs_1.default.readFileSync(filePath, { encoding: "utf8" });
+        const parsedFilePath = path.parse(filePath);
+        if (parsedFilePath.base === DOCUMENT_METADATA_FILE) {
+            const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
             const item = JSON.parse(itemJson);
             yield {
                 item,
@@ -108,7 +90,7 @@ function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
         }
     }
 }
-function* iterLoadSenatDossiersLegislatifsTextes(dataDir, session, options = {}) {
+export function* iterLoadSenatDossiersLegislatifsTextes(dataDir, session, options = {}) {
     for (const { item: dossierLegislatif } of iterLoadSenatDossiersLegislatifs(dataDir, session, options)) {
         for (const lecture of dossierLegislatif.lectures) {
             const lecturesSenat = lecture.lectures_assemblee.filter((lectureAssemblee) => lectureAssemblee.assemblee === "Sénat");
@@ -127,8 +109,8 @@ function* iterLoadSenatDossiersLegislatifsTextes(dataDir, session, options = {})
                         item: enrichedTexte,
                     };
                     if (texte.url) {
-                        const texteName = path_1.default.parse(texte.url).name;
-                        texteItem.filePathFromDataset = path_1.default.join(`${texte.session ?? datautil_1.UNDEFINED_SESSION}`, texteName, `${texteName}.pdf`);
+                        const texteName = path.parse(texte.url).name;
+                        texteItem.filePathFromDataset = path.join(`${texte.session ?? UNDEFINED_SESSION}`, texteName, `${texteName}.pdf`);
                     }
                     yield texteItem;
                 }
@@ -136,25 +118,25 @@ function* iterLoadSenatDossiersLegislatifsTextes(dataDir, session, options = {})
         }
     }
 }
-function loadSenatTexteContent(dataDir, textePathFromDataset) {
-    const parsedTextePath = path_1.default.parse(textePathFromDataset);
+export function loadSenatTexteContent(dataDir, textePathFromDataset) {
+    const parsedTextePath = path.parse(textePathFromDataset);
     const jsonTexteName = `${parsedTextePath.name}.json`;
-    const fullTextePath = path_1.default.join(dataDir, exports.TEXTE_FOLDER, exports.TEXTE_TRANSFORMED_FOLDER, parsedTextePath.dir, jsonTexteName);
-    if (!fs_1.default.existsSync(fullTextePath)) {
+    const fullTextePath = path.join(dataDir, TEXTE_FOLDER, TEXTE_TRANSFORMED_FOLDER, parsedTextePath.dir, jsonTexteName);
+    if (!fs.existsSync(fullTextePath)) {
         return { item: null };
     }
-    const texteJson = fs_1.default.readFileSync(fullTextePath, { encoding: "utf8" });
+    const texteJson = fs.readFileSync(fullTextePath, { encoding: "utf8" });
     return { item: JSON.parse(texteJson) };
 }
-function* iterLoadSenatOrganismes(dataDir, options = {}) {
-    for (const organismeItem of iterLoadSenatItems(dataDir, datasets_1.datasets.sens, undefined, exports.SENS_ORGANISMES_FOLDER, options)) {
+export function* iterLoadSenatOrganismes(dataDir, options = {}) {
+    for (const organismeItem of iterLoadSenatItems(dataDir, datasets.sens, undefined, SENS_ORGANISMES_FOLDER, options)) {
         yield organismeItem;
     }
 }
-function* iterLoadSenatSenateurs(dataDir, legislature, options = {}) {
-    const dateDebutLegislatureStr = legislatures_json_1.default.find((legislatureInfo) => legislatureInfo.numero === legislature)?.date_debut;
+export function* iterLoadSenatSenateurs(dataDir, legislature, options = {}) {
+    const dateDebutLegislatureStr = legislatures.find((legislatureInfo) => legislatureInfo.numero === legislature)?.date_debut;
     const dateDebutLegislature = new Date(dateDebutLegislatureStr);
-    for (const senateurItem of iterLoadSenatItems(dataDir, datasets_1.datasets.sens, undefined, exports.SENS_SENATEURS_FOLDER, options)) {
+    for (const senateurItem of iterLoadSenatItems(dataDir, datasets.sens, undefined, SENS_SENATEURS_FOLDER, options)) {
         const dateFinMandatSenateur = senateurItem.item.mandats_senateur[0]
             ?.date_fin
             ? new Date(senateurItem.item.mandats_senateur[0]?.date_fin)
@@ -165,13 +147,13 @@ function* iterLoadSenatSenateurs(dataDir, legislature, options = {}) {
         yield senateurItem;
     }
 }
-function* iterLoadSenatCirconscriptions(dataDir, options = {}) {
-    for (const circonscriptionItem of iterLoadSenatItems(dataDir, datasets_1.datasets.sens, undefined, exports.SENS_CIRCONSCRIPTIONS_FOLDER, options)) {
+export function* iterLoadSenatCirconscriptions(dataDir, options = {}) {
+    for (const circonscriptionItem of iterLoadSenatItems(dataDir, datasets.sens, undefined, SENS_CIRCONSCRIPTIONS_FOLDER, options)) {
         yield circonscriptionItem;
     }
 }
-function* iterLoadSenatQuestions(dataDir, legislature, options = {}) {
-    for (const questionItem of iterLoadSenatItems(dataDir, datasets_1.datasets.questions, legislature, undefined, options)) {
+export function* iterLoadSenatQuestions(dataDir, legislature, options = {}) {
+    for (const questionItem of iterLoadSenatItems(dataDir, datasets.questions, legislature, undefined, options)) {
         yield questionItem;
     }
 }

package/lib/model/ameli.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAll = findAll;
-const postgres_1 = require("kysely/helpers/postgres");
-const databases_1 = require("../databases");
-const util_1 = require("./util");
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { dbAmeli } from "../databases";
+import { concat, toDateString } from "./util";
 function auteurs(amendementId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbAmeli
+    return jsonArrayFrom(dbAmeli
         .selectFrom("amdsen")
         .leftJoin("sen_ameli", "amdsen.senid", "sen_ameli.entid")
         .where("amdsen.amdid", "=", amendementId)
@@ -16,7 +13,7 @@ function auteurs(amendementId) {
     ])
         .orderBy("amdsen.rng asc"));
 }
-const findAllQuery = databases_1.dbAmeli
+const findAllQuery = dbAmeli
     .selectFrom("amd")
     .leftJoin("sub", "amd.subid", "sub.id")
     .leftJoin("typsub", "sub.typid", "typsub.id")
@@ -58,7 +55,7 @@ const findAllQuery = databases_1.dbAmeli
     "sub.lic as subdivision_libelle_court",
     "typsub.lib as subdivision_type",
     "amd.alinea as alinea",
-    (0, util_1.toDateString)(ref("amd.datdep")).as("date_depot"),
+    toDateString(ref("amd.datdep")).as("date_depot"),
     eb
         .case()
         .when("amd.etaid", "=", 8)
@@ -72,7 +69,7 @@ const findAllQuery = databases_1.dbAmeli
     "avigvt.lib as avis_gouvernement",
     eb.fn.coalesce("sor.lib", "irr.libirr").as("sort"),
     "amd.rev as revision",
-    (0, util_1.concat)(val("https://www.senat.fr/amendements/"), ref("ses.lil"), val("/"), ref("txt_ameli.numabs"), val("/Amdt_"), ref("amd.numabs"), val(".html")).as("url"),
+    concat(val("https://www.senat.fr/amendements/"), ref("ses.lil"), val("/"), ref("txt_ameli.numabs"), val("/Amdt_"), ref("amd.numabs"), val(".html")).as("url"),
     "grppol_ameli.lilcou as au_nom_de_groupe_politique",
     "com_ameli.lil as au_nom_de_commission",
     eb
@@ -84,6 +81,6 @@ const findAllQuery = databases_1.dbAmeli
         .as("auteur_est_gouvernement"),
 ])
     .select(({ ref }) => [auteurs(ref("amd.id")).as("auteurs")]);
-function findAll() {
+export function findAll() {
     return findAllQuery.stream();
 }