@tricoteuses/senat 1.3.2 → 1.3.5

package/lib/model/dosleg.js

@@ -1,32 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAll = findAll;
-exports.findSenatTexteUrls = findSenatTexteUrls;
-exports.findSenatRapportUrls = findSenatRapportUrls;
-const kysely_1 = require("kysely");
-const postgres_1 = require("kysely/helpers/postgres");
-const databases_1 = require("../databases");
-const util_1 = require("./util");
+import { sql } from "kysely";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { dbDosleg } from "../databases";
+import { concat, removeSubstring, rtrim, toDateString } from "./util";
 function orderOrdreOrigineTexte(expr) {
-    return (0, kysely_1.sql) `array_position(array['0','2','1'], ${expr})`;
+    return sql `array_position(array['0','2','1'], ${expr})`;
 }
 function datesSeances(lectureAssembleeId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("date_seance")
         .where("date_seance.lecidt", "=", lectureAssembleeId)
         .select(({ ref }) => [
-        (0, util_1.toDateString)(ref("date_seance.date_s")).as("date"),
+        toDateString(ref("date_seance.date_s")).as("date"),
     ]));
 }
 function organismesRapport(rapportId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("org")
         .leftJoin("raporg", "raporg.orgcod", "org.orgcod")
         .where("raporg.rapcod", "=", rapportId)
         .select(["org.orgnom as libelle"]));
 }
 function auteursRapport(rapportId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("auteur")
         .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
         .where("ecr.rapcod", "=", rapportId)
@@ -38,28 +33,28 @@ function auteursRapport(rapportId) {
         .orderBy("ecr.ecrnumtri", "asc"));
 }
 function rapports(lectureAssembleeId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("rap")
         .leftJoin("lecassrap", "lecassrap.rapcod", "rap.rapcod")
         .leftJoin("denrap", "denrap.coddenrap", "rap.coddenrap")
         .where("lecassrap.lecassidt", "=", lectureAssembleeId)
         .select(({ eb, ref, val }) => [
         "rap.rapnum as numero",
-        (0, util_1.rtrim)(ref("denrap.libdenrap")).as("type_rapport"),
+        rtrim(ref("denrap.libdenrap")).as("type_rapport"),
         eb
             .case()
             .when("rap.typurl", "=", "I")
-            .then((0, util_1.concat)(val("https://www.senat.fr/rap/"), (0, util_1.rtrim)(ref("rap.rapurl"))))
-            .else((0, util_1.rtrim)(ref("rap.rapurl")))
+            .then(concat(val("https://www.senat.fr/rap/"), rtrim(ref("rap.rapurl"))))
+            .else(rtrim(ref("rap.rapurl")))
             .end()
             .as("url"),
-        (0, util_1.toDateString)(ref("rap.date_depot")).as("date_depot"),
+        toDateString(ref("rap.date_depot")).as("date_depot"),
         auteursRapport(ref("rap.rapcod")).as("auteurs"),
         organismesRapport(ref("rap.rapcod")).as("organismes"),
     ]));
 }
 function auteursTexte(texteId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("auteur")
         .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
         .where("ecr.texcod", "=", texteId)
@@ -71,7 +66,7 @@ function auteursTexte(texteId) {
         .orderBy("ecr.ecrnumtri", "asc"));
 }
 function textes(lectureAssembleeId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("texte")
         .leftJoin("oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
         .leftJoin("typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
@@ -81,33 +76,33 @@ function textes(lectureAssembleeId) {
         eb
             .case()
             .when("texte.typurl", "=", "I")
-            .then((0, util_1.removeSubstring)(ref("texte.texurl"), val(".html")))
+            .then(removeSubstring(ref("texte.texurl"), val(".html")))
             .else(null)
             .end()
             .as("id"),
         eb
             .case()
             .when("texte.typurl", "=", "I")
-            .then((0, util_1.concat)(val("https://www.senat.fr/leg/"), (0, util_1.rtrim)(ref("texte.texurl"))))
-            .else((0, util_1.rtrim)(ref("texte.texurl")))
+            .then(concat(val("https://www.senat.fr/leg/"), rtrim(ref("texte.texurl"))))
+            .else(rtrim(ref("texte.texurl")))
             .end()
             .as("url"),
-        (0, util_1.rtrim)(ref("oritxt.oritxtlib")).as("origine_texte"),
-        (0, util_1.rtrim)(ref("typtxt.typtxtlib")).as("type_texte"),
-        (0, util_1.toDateString)(ref("texte.txtoritxtdat")).as("date"),
+        rtrim(ref("oritxt.oritxtlib")).as("origine_texte"),
+        rtrim(ref("typtxt.typtxtlib")).as("type_texte"),
+        toDateString(ref("texte.txtoritxtdat")).as("date"),
         "sesann as session",
         auteursTexte(ref("texte.texcod")).as("auteurs"),
     ])
         .orderBy(({ ref }) => orderOrdreOrigineTexte(ref("oritxt.oriordre"))));
 }
 function lecturesAssemblee(lectureId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("lecass")
         .where("lecass.lecidt", "=", lectureId)
         .leftJoin("ass", "ass.codass", "lecass.codass")
         .leftJoin("org", "org.orgcod", "lecass.orgcod")
         .select(({ ref }) => [
-        (0, util_1.rtrim)(ref("ass.libass")).as("assemblee"),
+        rtrim(ref("ass.libass")).as("assemblee"),
         "org.orgnom as libelle_organisme",
         "org.orgcod as code_organisme",
         "lecass.ordreass as ordre_lecture_assemblee",
@@ -118,71 +113,71 @@ function lecturesAssemblee(lectureId) {
         .orderBy("lecass.ordreass", "asc"));
 }
 function lectures(loiId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("lecture")
         .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
         .where("lecture.loicod", "=", loiId)
         .select(({ ref }) => [
-        (0, util_1.rtrim)(ref("typlec.typleclib")).as("type_lecture"),
-        (0, util_1.rtrim)(ref("lecture.leccom")).as("libelle"),
+        rtrim(ref("typlec.typleclib")).as("type_lecture"),
+        rtrim(ref("lecture.leccom")).as("libelle"),
         "typlec.typlecord as ordre_lecture",
         lecturesAssemblee(ref("lecture.lecidt")).as("lectures_assemblee"),
     ])
         .orderBy("typlec.typlecord", "asc"));
 }
 function themes(loiId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbDosleg
+    return jsonArrayFrom(dbDosleg
         .selectFrom("the")
         .leftJoin("loithe", "loithe.thecle", "the.thecle")
         .where("loithe.loicod", "=", loiId)
         .select(["the.thelib as libelle"]));
 }
-const findAllQuery = databases_1.dbDosleg
+const findAllQuery = dbDosleg
     .selectFrom("loi")
     .leftJoin("typloi", "typloi.typloicod", "loi.typloicod")
     .leftJoin("etaloi", "etaloi.etaloicod", "loi.etaloicod")
     .select(({ eb, ref, val }) => [
     "loi.signet as signet",
-    (0, util_1.concat)(val("https://www.senat.fr/dossier-legislatif/"), ref("loi.signet"), val(".html")).as("url"),
-    (0, util_1.concat)((0, util_1.rtrim)(ref("typloi.typloiden")), val(" "), (0, util_1.rtrim)(ref("loi.loitit"))).as("titre"),
-    (0, util_1.rtrim)(ref("loi.loient")).as("titre_court"),
-    (0, util_1.rtrim)(ref("typloi.groupe")).as("code_nature_dossier"),
-    (0, util_1.rtrim)(ref("typloi.typloilib")).as("libelle_type_dossier"),
-    (0, util_1.rtrim)(ref("etaloi.etaloilib")).as("etat_dossier"),
+    concat(val("https://www.senat.fr/dossier-legislatif/"), ref("loi.signet"), val(".html")).as("url"),
+    concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loitit"))).as("titre"),
+    rtrim(ref("loi.loient")).as("titre_court"),
+    rtrim(ref("typloi.groupe")).as("code_nature_dossier"),
+    rtrim(ref("typloi.typloilib")).as("libelle_type_dossier"),
+    rtrim(ref("etaloi.etaloilib")).as("etat_dossier"),
     "loi.url_an as url_dossier_assemblee_nationale",
-    (0, util_1.toDateString)(ref("loi.date_decision")).as("date_decision_CoC"),
+    toDateString(ref("loi.date_decision")).as("date_decision_CoC"),
     "loi.num_decision as num_decision_CoC",
     "loi.deccocurl as url_decision_CoC",
-    (0, util_1.toDateString)(ref("loi.saisine_date")).as("date_saisine_CoC"),
+    toDateString(ref("loi.saisine_date")).as("date_saisine_CoC"),
     "loi.saisine_par as condition_saisine_CoC",
-    (0, util_1.toDateString)(ref("loi.date_loi")).as("date_promulgation"),
+    toDateString(ref("loi.date_loi")).as("date_promulgation"),
     "loi.numero as numero_loi",
     eb
         .case()
         .when("loi.loititjo", "is not", null)
-        .then((0, util_1.concat)((0, util_1.rtrim)(ref("typloi.typloiden")), val(" "), (0, util_1.rtrim)(ref("loi.loititjo"))))
+        .then(concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loititjo"))))
         .else("")
         .end()
         .as("titre_JO"),
-    (0, util_1.toDateString)(ref("loi.loidatjo")).as("date_publication_JO"),
+    toDateString(ref("loi.loidatjo")).as("date_publication_JO"),
     "loi.loinumjo as numero_JO",
     "loi.url_jo as url_JO",
     lectures(ref("loi.loicod")).as("lectures"),
     themes(ref("loi.loicod")).as("themes"),
 ])
     .$narrowType();
-function findAll() {
+export function findAll() {
     return findAllQuery.stream();
 }
-function findSenatTexteUrls(sessions = []) {
-    return databases_1.dbDosleg
+export function findSenatTexteUrls(sessions = []) {
+    return dbDosleg
         .selectFrom("texte")
         .where("texurl", "is not", null)
         .where("typurl", "=", "I")
         .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessions))
         .select(({ eb, ref }) => [
         "sesann as session",
-        (0, util_1.rtrim)(ref("texurl")).as("url"),
+        rtrim(ref("texurl")).as("url"),
         eb
             .case()
             .when("oritxtcod", "=", "1")
@@ -194,13 +189,13 @@ function findSenatTexteUrls(sessions = []) {
         .$narrowType()
         .stream();
 }
-function findSenatRapportUrls(sessions = []) {
-    return databases_1.dbDosleg
+export function findSenatRapportUrls(sessions = []) {
+    return dbDosleg
         .selectFrom("rap")
         .where("rapurl", "is not", null)
         .where("typurl", "=", "I")
         .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessions))
-        .select(({ ref }) => [(0, util_1.rtrim)(ref("rapurl")).as("url"), "sesann as session"])
+        .select(({ ref }) => [rtrim(ref("rapurl")).as("url"), "sesann as session"])
         .$narrowType()
         .stream();
 }

package/lib/model/index.js

@@ -1,13 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllOrganismes = exports.findAllCirconscriptions = exports.findAllSens = exports.findAllQuestions = exports.findAllLois = exports.findAllAmendements = void 0;
-var ameli_1 = require("./ameli");
-Object.defineProperty(exports, "findAllAmendements", { enumerable: true, get: function () { return ameli_1.findAll; } });
-var dosleg_1 = require("./dosleg");
-Object.defineProperty(exports, "findAllLois", { enumerable: true, get: function () { return dosleg_1.findAll; } });
-var questions_1 = require("./questions");
-Object.defineProperty(exports, "findAllQuestions", { enumerable: true, get: function () { return questions_1.findAll; } });
-var sens_1 = require("./sens");
-Object.defineProperty(exports, "findAllSens", { enumerable: true, get: function () { return sens_1.findAll; } });
-Object.defineProperty(exports, "findAllCirconscriptions", { enumerable: true, get: function () { return sens_1.findAllCirconscriptions; } });
-Object.defineProperty(exports, "findAllOrganismes", { enumerable: true, get: function () { return sens_1.findAllOrganismes; } });
+export { findAll as findAllAmendements } from "./ameli";
+export { findAll as findAllLois } from "./dosleg";
+export { findAll as findAllQuestions } from "./questions";
+export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";

package/lib/model/questions.js

@@ -1,15 +1,12 @@
-"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 { dbQuestions } from "../databases";
+import { expandToRows, rtrim, toDateString } from "./util";
 function reponses(questionId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbQuestions
+    return jsonArrayFrom(dbQuestions
         .selectFrom("tam_reponses")
         .where("tam_reponses.idque", "=", questionId)
         .select(({ ref }) => [
-        (0, util_1.toDateString)(ref("tam_reponses.datejorep")).as("date_reponse_JO"),
+        toDateString(ref("tam_reponses.datejorep")).as("date_reponse_JO"),
         "tam_reponses.minreplib as ministere_reponse",
         "tam_reponses.txtrep as texte",
         "tam_reponses.txterrrep as texte_erratum",
@@ -17,13 +14,13 @@ function reponses(questionId) {
         .orderBy("tam_reponses.datejorep asc"));
 }
 function themes(questionId) {
-    return (0, postgres_1.jsonArrayFrom)(databases_1.dbQuestions
+    return jsonArrayFrom(dbQuestions
         .with("question_theme", (db) => db
         .selectFrom("tam_questions")
         .select(({ eb, ref, val }) => [
         "id as question_id",
         eb
-            .cast((0, util_1.expandToRows)(ref("tam_questions.themes"), val("#(\\d+)")), "smallint")
+            .cast(expandToRows(ref("tam_questions.themes"), val("#(\\d+)")), "smallint")
             .as("theme_id"),
     ]))
         .selectFrom("the")
@@ -32,7 +29,7 @@ function themes(questionId) {
         .select("the.thelib as libelle")
         .orderBy("the.thenouidt asc"));
 }
-const findAllQuery = databases_1.dbQuestions
+const findAllQuery = dbQuestions
     .selectFrom("tam_questions")
     .leftJoin("tam_ministeres", "tam_questions.mindepotid", "tam_ministeres.minid")
     .leftJoin("sortquestion", (join) => join.onRef("tam_questions.sorquecod", "=", (eb) => eb.cast("sortquestion.sorquecod", "bigint")))
@@ -53,14 +50,14 @@ const findAllQuery = databases_1.dbQuestions
     "tam_questions.circonscription as circonscription",
     "tam_questions.groupe as groupe",
     "tam_questions.ratgrp as type_appartenance",
-    (0, util_1.toDateString)(ref("tam_questions.datejodepot")).as("date_publication_JO"),
-    (0, util_1.rtrim)(ref("tam_questions.mindepotlib")).as("ministere_depot"),
-    (0, util_1.toDateString)(ref("tam_ministeres.datedebut")).as("ministere_depot_date_debut"),
-    (0, util_1.toDateString)(ref("tam_questions.datejotran")).as("date_transmission"),
+    toDateString(ref("tam_questions.datejodepot")).as("date_publication_JO"),
+    rtrim(ref("tam_questions.mindepotlib")).as("ministere_depot"),
+    toDateString(ref("tam_ministeres.datedebut")).as("ministere_depot_date_debut"),
+    toDateString(ref("tam_questions.datejotran")).as("date_transmission"),
     "tam_questions.mintranlib as ministere_transmission",
-    (0, util_1.toDateString)(ref("tam_questions.datejorep1")).as("date_reponse_JO"),
+    toDateString(ref("tam_questions.datejorep1")).as("date_reponse_JO"),
     "tam_questions.minreplib1 as ministere_reponse",
-    (0, util_1.toDateString)(ref("tam_questions.datecloture")).as("date_cloture"),
+    toDateString(ref("tam_questions.datecloture")).as("date_cloture"),
     "tam_questions.refquerappelee as reference_question_rappelee",
     //"tam_questions.url as url", // TODO ?
     "tam_questions.txtque as texte",
@@ -71,6 +68,6 @@ const findAllQuery = databases_1.dbQuestions
     themes(ref("tam_questions.id")).as("themes"),
     reponses(ref("tam_questions.id")).as("reponses"),
 ]);
-function findAll() {
+export function findAll() {
     return findAllQuery.stream();
 }

package/lib/model/sens.d.ts

@@ -389,8 +389,8 @@ declare const findAllOrganismesQuery: import("kysely").SelectQueryBuilder<{
     zongeo: import("../raw_types/sens").Zongeo;
     all_organismes: {
         orgcod: string;
-        typorgcod: string;
         orgdatfin: Date | null;
+        typorgcod: string;
         evelib: string | null;
         evelic: string | null;
         evelil: string | null;