@tricoteuses/senat 1.3.5 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -74,14 +74,12 @@ Use the environment variable `CATEGORIES` and `SESSIONS` if needed.
74
74
  Once the data is downloaded, you can use loaders to retrieve it.
75
75
  To use loaders in your project, you can install the _@tricoteuses/senat_ package, and import the iterator functions that you need.
76
76
 
77
- _Only iterator for Questions, Sénateurs and Circonscriptions available for now_
78
-
79
77
  ```bash
80
78
  npm install @tricoteuses/senat
81
79
  ```
82
80
 
83
81
  ```js
84
- import { iterLoadSenatQuestions } from "@tricoteuses/senat/lib/loaders"
82
+ import { iterLoadSenatQuestions } from "@tricoteuses/senat/loaders"
85
83
 
86
84
  // Pass data directory and legislature as arguments
87
85
  for (const { item: question } of iterLoadSenatQuestions("../senat-data", 17)) {
package/lib/index.d.ts CHANGED
@@ -2,11 +2,8 @@ export type { AmendementResult, } from "./model/ameli";
2
2
  export type { DossierLegislatifResult, } from "./model/dosleg";
3
3
  export type { QuestionResult, } from "./model/questions";
4
4
  export type { CirconscriptionResult, OrganismeResult, SenateurResult, } from "./model/sens";
5
- export { sesFieldsToParseInt, sesFieldsToTrim, subFieldsToParseInt, subFieldsToTrim, txtAmeliFieldsToTrim, } from "./types/ameli";
6
5
  export type { Ses, Sub, TxtAmeli } from "./types/ameli";
7
- export { debatsFieldsToTrim, lecassdebFieldsToTrim } from "./types/debats";
8
6
  export type { Debat, LecAssDeb } from "./types/debats";
9
- 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";
10
7
  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";
11
8
  export type { Photo, Sen } from "./types/sens";
12
9
  export { Session } from "./types/sessions";
package/lib/index.js CHANGED
@@ -1,4 +1 @@
1
- export { sesFieldsToParseInt, sesFieldsToTrim, subFieldsToParseInt, subFieldsToTrim, txtAmeliFieldsToTrim, } from "./types/ameli";
2
- export { debatsFieldsToTrim, lecassdebFieldsToTrim } from "./types/debats";
3
- 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";
4
1
  export { Session } from "./types/sessions";
@@ -49,7 +49,7 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
49
49
  date_depot: string;
50
50
  dispositif: string | null;
51
51
  objet: string | null;
52
- etat_id: number;
52
+ etat: string;
53
53
  avis_commission: string | null;
54
54
  avis_gouvernement: string | null;
55
55
  sort: string | null;
@@ -86,7 +86,7 @@ export declare function findAll(): AsyncIterableIterator<{
86
86
  date_depot: string;
87
87
  dispositif: string | null;
88
88
  objet: string | null;
89
- etat_id: number;
89
+ etat: string;
90
90
  avis_commission: string | null;
91
91
  avis_gouvernement: string | null;
92
92
  sort: string | null;
@@ -43,7 +43,7 @@ const findAllQuery = dbAmeli
43
43
  .then(val("Motion"))
44
44
  .when("amd.typ", "=", "S")
45
45
  .then(val("Sous-amendement"))
46
- .else("'")
46
+ .else("")
47
47
  .end()
48
48
  .as("nature"),
49
49
  "amd.id as id",
@@ -56,15 +56,23 @@ const findAllQuery = dbAmeli
56
56
  "typsub.lib as subdivision_type",
57
57
  "amd.alinea as alinea",
58
58
  toDateString(ref("amd.datdep")).as("date_depot"),
59
+ "amd.dis as dispositif",
60
+ "amd.obj as objet",
59
61
  eb
60
62
  .case()
63
+ .when("amd.etaid", "=", 7)
64
+ .then(val("Diffusé"))
61
65
  .when("amd.etaid", "=", 8)
62
- .then(val("Cet amendement a été retiré avant séance."))
63
- .else(ref("amd.dis"))
66
+ .then(val("Retiré avant réunion ou séance"))
67
+ .when("amd.etaid", "=", 9)
68
+ .then(val("Examiné en commission ou séance"))
69
+ .when("amd.etaid", "=", 10)
70
+ .then(val("Irrecevable"))
71
+ .when("amd.etaid", "=", 11)
72
+ .then(val("Irrecevable"))
73
+ .else("")
64
74
  .end()
65
- .as("dispositif"),
66
- "amd.obj as objet",
67
- "amd.etaid as etat_id",
75
+ .as("etat"),
68
76
  "avicom.lib as avis_commission",
69
77
  "avigvt.lib as avis_gouvernement",
70
78
  eb.fn.coalesce("sor.lib", "irr.libirr").as("sort"),
@@ -3,8 +3,3 @@ export type { Ses, Sub };
3
3
  export interface TxtAmeli extends txt_ameli {
4
4
  subids?: subFields.id[];
5
5
  }
6
- export declare const sesFieldsToParseInt: string[];
7
- export declare const sesFieldsToTrim: string[];
8
- export declare const subFieldsToParseInt: string[];
9
- export declare const subFieldsToTrim: string[];
10
- export declare const txtAmeliFieldsToTrim: string[];
@@ -1,13 +1 @@
1
- export const sesFieldsToParseInt = ["ann"];
2
- export const sesFieldsToTrim = ["lil"];
3
- export const subFieldsToParseInt = ["pos", "posder", "prires"];
4
- export const subFieldsToTrim = ["lic", "lib", "sig", "style"];
5
- export const txtAmeliFieldsToTrim = [
6
- "num",
7
- "int",
8
- "inl",
9
- "libdelim",
10
- "libcplnat",
11
- "doslegsignet",
12
- "ordsnddelib",
13
- ];
1
+ export {};
@@ -1,4 +1,2 @@
1
1
  import { debats as Debat, lecassdeb as LecAssDeb } from "../raw_types_schemats/debats";
2
2
  export type { Debat, LecAssDeb };
3
- export declare const debatsFieldsToTrim: string[];
4
- export declare const lecassdebFieldsToTrim: string[];
@@ -1,2 +1 @@
1
- export const debatsFieldsToTrim = ["deburl", "libspec"];
2
- export const lecassdebFieldsToTrim = ["lecassidt"];
1
+ export {};
@@ -68,31 +68,3 @@ export interface Texte extends texte {
68
68
  txtAmeli?: TxtAmeli;
69
69
  txtAmeliId: txt_ameliFields.id;
70
70
  }
71
- export declare const assFieldsToTrim: string[];
72
- export declare const audFieldsToTrim: string[];
73
- export declare const auteurFieldsToTrim: string[];
74
- export declare const dateSeanceFieldsToTrim: string[];
75
- export declare const deccocFieldsToTrim: string[];
76
- export declare const denrapFieldsToTrim: string[];
77
- export declare const docattFieldsToParseInt: string[];
78
- export declare const docattFieldsToTrim: string[];
79
- export declare const ecrFieldsToTrim: string[];
80
- export declare const etaloiFieldsToTrim: string[];
81
- export declare const lecassFieldsToTrim: string[];
82
- export declare const lecassrapFieldsToTrim: string[];
83
- export declare const lectureFieldsToTrim: string[];
84
- export declare const loiFieldsToTrim: string[];
85
- export declare const orgFieldsToTrim: string[];
86
- export declare const oritxtFieldsToTrim: string[];
87
- export declare const quaFieldsToTrim: string[];
88
- export declare const rapFieldsToParseInt: string[];
89
- export declare const rapFieldsToTrim: string[];
90
- export declare const raporgFieldsToTrim: string[];
91
- export declare const scrFieldsToTrim: string[];
92
- export declare const texteFieldsToParseInt: string[];
93
- export declare const texteFieldsToTrim: string[];
94
- export declare const typattFieldsToTrim: string[];
95
- export declare const typlecFieldsToTrim: string[];
96
- export declare const typloiFieldsToTrim: string[];
97
- export declare const typtxtFieldsToTrim: string[];
98
- export declare const typurlFieldsToTrim: string[];
@@ -1,151 +1 @@
1
- export const assFieldsToTrim = ["libass"];
2
- export const audFieldsToTrim = ["lecassidt", "audtit", "audurl", "orgcod"];
3
- export const auteurFieldsToTrim = [
4
- "autcod",
5
- "quacod",
6
- "typautcod",
7
- "nomuse",
8
- "prenom",
9
- "nomtec",
10
- "autmat",
11
- "autfct",
12
- ];
13
- export const dateSeanceFieldsToTrim = ["lecidt", "statut"];
14
- export const deccocFieldsToTrim = ["deccoccod", "deccoclib"];
15
- export const denrapFieldsToTrim = [
16
- "coddenrap",
17
- "typraprap",
18
- "libdenrap",
19
- "denrapmin",
20
- "denraptit",
21
- "denrapstymin",
22
- "solnatrapcod",
23
- ];
24
- export const docattFieldsToParseInt = ["docattcle", "rapcod"];
25
- export const docattFieldsToTrim = ["docatturl"];
26
- export const ecrFieldsToTrim = ["autcod", "ecrqua"];
27
- export const etaloiFieldsToTrim = ["etaloilib"];
28
- export const lecassFieldsToTrim = [
29
- "lecassidt",
30
- "lecidt",
31
- "ptlurl",
32
- "ptlnumcpl",
33
- "ptlnot",
34
- "ptlurl2",
35
- "ptlnot2",
36
- "ptlurl3",
37
- "ptlnot3",
38
- "ptlnumcpl2",
39
- "ptlnumcpl3",
40
- "lecassame",
41
- "orgcod",
42
- "loiintmod",
43
- "reucom",
44
- "debatsurl",
45
- "libppr",
46
- "ptlurlcom",
47
- "aliasppr",
48
- "lecassamecom",
49
- ];
50
- export const lecassrapFieldsToTrim = ["lecassidt"];
51
- export const lectureFieldsToTrim = ["lecidt", "loicod", "typleccod", "leccom"];
52
- export const loiFieldsToTrim = [
53
- "loicod",
54
- "typloicod",
55
- "deccoccod",
56
- "numero",
57
- "loient",
58
- "motclef",
59
- "loitit",
60
- "loiint",
61
- "url_jo",
62
- "loinumjo",
63
- "loititjo",
64
- "url_jo2",
65
- "loinumjo2",
66
- "deccocurl",
67
- "num_decision",
68
- "loicodmai",
69
- "loinoudelibcod",
70
- "motionloiorigcod",
71
- "url_ordonnance",
72
- "saisine_par",
73
- "loinumjo3",
74
- "url_jo3",
75
- "url_an",
76
- "url_presart",
77
- "signetalt",
78
- "orgcod",
79
- "doscocurl",
80
- "loiintori",
81
- ];
82
- export const orgFieldsToTrim = [
83
- "orgcod",
84
- "typorgcod",
85
- "orgnom",
86
- "orgliblon",
87
- "orglibaff",
88
- "orgurl",
89
- "orglibcou",
90
- "org_de",
91
- "urltra",
92
- "inttra",
93
- "orgnomcouv",
94
- "senorgcod",
95
- "html_color",
96
- ];
97
- export const oritxtFieldsToTrim = ["oritxtcod", "oritxtlib", "oritxtlibfem"];
98
- export const quaFieldsToTrim = ["quacod", "qualic", "quaabr", "quaabrplu"];
99
- export const rapFieldsToParseInt = ["rapcod", "sesann", "rapnum", "rapnuman"];
100
- export const rapFieldsToTrim = [
101
- "coddenrap",
102
- "blecod",
103
- "raptitcou",
104
- "raptil",
105
- "rapurl",
106
- "url2",
107
- "url3",
108
- "url4",
109
- "url2txt",
110
- "url3txt",
111
- "url4txt",
112
- "prix",
113
- "numerobis",
114
- "rapsoustit",
115
- "rapres",
116
- "forpubcod",
117
- ];
118
- export const raporgFieldsToTrim = ["orgcod"];
119
- export const scrFieldsToTrim = ["scrint", "soslib"];
120
- export const texteFieldsToParseInt = ["texcod", "sesann", "texnum"];
121
- export const texteFieldsToTrim = [
122
- "oritxtcod",
123
- "typtxtcod",
124
- "lecassidt",
125
- "orgcod",
126
- "texurl",
127
- "url2",
128
- "url3",
129
- "url4",
130
- "url2txt",
131
- "url3txt",
132
- "url4txt",
133
- "prix",
134
- "numerobis",
135
- "reserve_comspe",
136
- ];
137
- export const typattFieldsToTrim = ["typattlib"];
138
- export const typlecFieldsToTrim = ["typleccod", "typleclib"];
139
- export const typloiFieldsToTrim = [
140
- "typloicod",
141
- "typloilib",
142
- "groupe",
143
- "typloiden",
144
- "typloigen",
145
- "typloitit",
146
- "typloidenplu",
147
- "typloide",
148
- "typloiabr",
149
- ];
150
- export const typtxtFieldsToTrim = ["typtxtcod", "typtxtlib"];
151
- export const typurlFieldsToTrim = ["libtypurl"];
1
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tricoteuses/senat",
3
- "version": "1.3.5",
3
+ "version": "1.4.1",
4
4
  "description": "Handle French Sénat's open data",
5
5
  "keywords": [
6
6
  "France",