@tricoteuses/assemblee 3.0.16 → 3.0.17

package/lib/datasets.d.ts

@@ -18,6 +18,7 @@ export interface Datasets {
     questions: Dataset[];
     comptesRendusSeances: Dataset[];
     comptesRendusCommissions: Dataset[];
+    comptesRendus: Dataset[];
 }
 export declare enum DatasetStructure {
     SingleFile = 0,
@@ -34,7 +35,8 @@ export declare enum EnabledDatasets {
     Questions = 64,
     ComptesRendusSeances = 128,
     ComptesRendusCommissions = 256,
-    All = 511
+    ComptesRendus = 512,
+    All = 1023
 }
 export declare function getDatasets(): string[];
 export declare function validDataset(dir: string[]): boolean;

package/lib/loaders.js

@@ -6,9 +6,9 @@ import "node:fs/promises";
 import { getChangedFilesSinceCommit as ue } from "./git.js";
 import { z as e } from "zod";
 import { E as x, F as Y, G as K, H as T, I as z, J as V, B as ie } from "./amendements-Bab1iUCY.js";
-import { C as me, D as se, F as Ce, j as de, L as pe, e as ge, M as Ie, b as Fe, P as Ve, R as De, O as Pe, a0 as fe, Y as Xe, aa as Oe, a2 as we, _ as qe, W as Le, a8 as Re, a4 as xe, a6 as $e, ao as l, ap as oe, aq as W, ar as ae, ac as Me, af as Ne, ag as ze, ab as ke, ad as Te, ae as Ue } from "./questions-DgERya4J.js";
+import { C as me, D as se, F as ve, j as de, L as pe, e as ge, M as Ie, b as Fe, P as Ve, R as De, O as Pe, a0 as fe, Y as Xe, aa as Oe, a2 as we, _ as qe, W as Le, a8 as Re, a4 as xe, a6 as $e, ao as l, ap as oe, aq as W, ar as ae, ac as Me, af as Ne, ag as ze, ab as ke, ad as Te, ae as Ue } from "./questions-DgERya4J.js";
 import { D as Je } from "./questions-C3qN4PsC.js";
-var h = /* @__PURE__ */ ((t) => (t[t.SingleFile = 0] = "SingleFile", t[t.SegmentedFiles = 1] = "SegmentedFiles", t))(h || {}), F = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.ActeursEtOrganes = 1] = "ActeursEtOrganes", t[t.Agendas = 2] = "Agendas", t[t.Amendements = 4] = "Amendements", t[t.DossiersLegislatifs = 8] = "DossiersLegislatifs", t[t.Photos = 16] = "Photos", t[t.Scrutins = 32] = "Scrutins", t[t.Questions = 64] = "Questions", t[t.ComptesRendusSeances = 128] = "ComptesRendusSeances", t[t.ComptesRendusCommissions = 256] = "ComptesRendusCommissions", t[t.All = 511] = "All", t))(F || {});
+var h = /* @__PURE__ */ ((t) => (t[t.SingleFile = 0] = "SingleFile", t[t.SegmentedFiles = 1] = "SegmentedFiles", t))(h || {}), F = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.ActeursEtOrganes = 1] = "ActeursEtOrganes", t[t.Agendas = 2] = "Agendas", t[t.Amendements = 4] = "Amendements", t[t.DossiersLegislatifs = 8] = "DossiersLegislatifs", t[t.Photos = 16] = "Photos", t[t.Scrutins = 32] = "Scrutins", t[t.Questions = 64] = "Questions", t[t.ComptesRendusSeances = 128] = "ComptesRendusSeances", t[t.ComptesRendusCommissions = 256] = "ComptesRendusCommissions", t[t.ComptesRendus = 512] = "ComptesRendus", t[t.All = 1023] = "All", t))(F || {});
 function* R(t, n = []) {
   const i = s.join(t, ...n);
   if (r.existsSync(i))
@@ -46,7 +46,7 @@ const Qe = [
   description: "L'état civil est la situation de la personne dans la société, résultat d'une procédure écrite d'identification administrative."
 }), Ge = e.object({
   catSocPro: e.string().optional().meta({ description: "Catégorie socio professionelle de l'INSEE." }),
-  famSocPro: Ce.optional().meta({
+  famSocPro: ve.optional().meta({
     description: "Famille socio professionelle de l'INSEE."
   })
 }), He = e.object({
@@ -373,7 +373,7 @@ const Z = {
   qualite: e.string().optional()
 }).meta({ description: "Orateur de la séance du débat." }), At = e.object({
   orateur: V(ne)
-}), vt = e.union([
+}), Ct = e.union([
   At,
   V(ne),
   ne,
@@ -391,7 +391,7 @@ const Z = {
     code_style: e.string().optional(),
     code_parole: e.string().optional(),
     valeur: e.string().optional(),
-    orateurs: vt.optional(),
+    orateurs: Ct.optional(),
     texte: e.union([k, e.string()]).optional(),
     paragraphe: V(M).optional(),
     interExtraction: V(M).optional(),
@@ -416,7 +416,7 @@ const Z = {
     qualite: e.string().optional(),
     nom_orateur: e.string().optional()
   }).meta({ description: "Point de la séance du débat." })
-), Ct = e.object({
+), vt = e.object({
   point: M
 }), It = e.object({
   journee: e.string(),
@@ -425,7 +425,7 @@ const Z = {
   quantiemes: It,
   ouvertureSeance: V(M).optional(),
   point: V(M),
-  finSeance: Ct.optional(),
+  finSeance: vt.optional(),
   paragraphe: V(M).optional()
 }).meta({ description: "Contenu de la séance du débat." }), Vt = e.object({
   id_syceron: e.string(),
@@ -1381,26 +1381,26 @@ const le = {
 };
 function* N(t, n, i, o, p, { log: f = !1, noValidation: _ = !1, sinceCommits: m } = {}) {
   const S = /* @__PURE__ */ new Set();
-  for (const v of i) {
-    if (v.ignoreForWeb || !Ht(n, v))
+  for (const C of i) {
+    if (C.ignoreForWeb || !Ht(n, C))
       continue;
-    const C = s.join(t, `${v.name}_nettoye`), I = m ? m[v.name] : void 0, L = I ? ue(C, I, {
+    const v = s.join(t, `${C.name}_nettoye`), I = m ? m[C.name] : void 0, L = I ? ue(v, I, {
       diffFilter: "AMR"
     }) : null;
     f && I && (console.log(
-      `Filtering files changed since commit ${I} in ${C}`
+      `Filtering files changed since commit ${I} in ${v}`
     ), console.log(`Found ${L?.size || 0} changed files`));
-    for (const D of R(C, p)) {
+    for (const D of R(v, p)) {
       if (!D[D.length - 1].endsWith(".json"))
         continue;
-      const X = s.join(C, ...D), O = s.join(...D), w = L?.get(O);
+      const X = s.join(v, ...D), O = s.join(...D), w = L?.get(O);
       if (L != null && w == null)
         continue;
       f && console.log(`Loading file: ${X}…`);
       let a = r.readFileSync(X, { encoding: "utf8" });
       const u = _ ? JSON.parse(a) : o(a);
       S.has(u.uid) || (S.add(u.uid), yield {
-        datasetLegislature: v.legislature,
+        datasetLegislature: C.legislature,
         filePath: X,
         item: u,
         ...w && { gitStatus: w }
@@ -1408,18 +1408,18 @@ function* N(t, n, i, o, p, { log: f = !1, noValidation: _ = !1, sinceCommits: m
     }
     if (I) {
       const D = ue(
-        C,
+        v,
         I,
         {
           diffFilter: "D"
         }
       );
       for (const [$, X] of D.entries()) {
-        const O = s.join(C, $);
+        const O = s.join(v, $);
         f && console.log(`Deleted file: ${O}`);
         const a = { uid: s.parse($).name };
         yield {
-          datasetLegislature: v.legislature,
+          datasetLegislature: C.legislature,
           filePath: O,
           item: a,
           gitStatus: X
@@ -1683,7 +1683,7 @@ function Sn(t, n, i, { log: o = !1 } = {}) {
             }
       }
     }
-  const v = {};
+  const C = {};
   if (n & F.Amendements)
     for (const a of A.amendements) {
       if (a.ignoreForWeb || i !== l.All && a.legislature !== l.All && i !== a.legislature)
@@ -1700,10 +1700,10 @@ function Sn(t, n, i, { log: o = !1 } = {}) {
         const j = r.readFileSync(c, {
           encoding: "utf8"
         }), g = ie.toAmendement(j);
-        v[g.uid] === void 0 && (v[g.uid] = g);
+        C[g.uid] === void 0 && (C[g.uid] = g);
       }
     }
-  const C = {}, I = {}, L = {}, D = {};
+  const v = {}, I = {}, L = {}, D = {};
   if (n & F.DossiersLegislatifs)
     for (const a of A.dossiersLegislatifs) {
       if (a.ignoreForWeb || i !== l.All && a.legislature !== l.All && i !== a.legislature)
@@ -1720,7 +1720,7 @@ function Sn(t, n, i, { log: o = !1 } = {}) {
         const j = r.readFileSync(c, {
           encoding: "utf8"
         }), g = W.toDocument(j);
-        C[g.uid] === void 0 && (C[g.uid] = g);
+        v[g.uid] === void 0 && (v[g.uid] = g);
       }
       for (const d of R(u, ["dossiers"])) {
         if (!d[d.length - 1].endsWith(".json"))
@@ -1823,8 +1823,8 @@ function Sn(t, n, i, { log: o = !1 } = {}) {
     }
   return {
     acteurByUid: p,
-    amendementByUid: v,
-    documentByUid: C,
+    amendementByUid: C,
+    documentByUid: v,
     dossierParlementaireBySenatChemin: I,
     dossierParlementaireByTitreChemin: L,
     dossierParlementaireByUid: D,
@@ -1880,7 +1880,7 @@ function bn(t, n, i, { log: o = !1 } = {}) {
             }
       }
     }
-  const v = {};
+  const C = {};
   if (n & F.Amendements)
     for (const a of A.amendements) {
       if (a.ignoreForWeb || i !== l.All && a.legislature !== l.All && i !== a.legislature)
@@ -1893,9 +1893,9 @@ function bn(t, n, i, { log: o = !1 } = {}) {
       const d = r.readFileSync(u, { encoding: "utf8" }), y = ie.toAmendements(d);
       for (const c of y.textesLegislatifs)
         for (const j of c.amendements)
-          v[j.uid] === void 0 && (v[j.uid] = j);
+          C[j.uid] === void 0 && (C[j.uid] = j);
     }
-  const C = {}, I = {}, L = {}, D = {};
+  const v = {}, I = {}, L = {}, D = {};
   if (n & F.DossiersLegislatifs)
     for (const a of A.dossiersLegislatifs) {
       if (a.ignoreForWeb || i !== l.All && a.legislature !== l.All && i !== a.legislature)
@@ -1907,7 +1907,7 @@ function bn(t, n, i, { log: o = !1 } = {}) {
       o && console.log(`Loading file: ${u}`);
       const d = r.readFileSync(u, { encoding: "utf8" }), y = W.toDossiersLegislatifs(d);
       for (const c of y.textesLegislatifs)
-        C[c.uid] === void 0 && (C[c.uid] = c);
+        v[c.uid] === void 0 && (v[c.uid] = c);
       for (const c of y.dossiersParlementaires) {
         const j = c.titreDossier;
         j.senatChemin && I[j.senatChemin] === void 0 && (I[j.senatChemin] = c), j.titreChemin && L[j.titreChemin] === void 0 && (L[j.titreChemin] = c), D[c.uid] === void 0 && (D[c.uid] = c);
@@ -1986,8 +1986,8 @@ function bn(t, n, i, { log: o = !1 } = {}) {
     }
   return {
     acteurByUid: p,
-    amendementByUid: v,
-    documentByUid: C,
+    amendementByUid: C,
+    documentByUid: v,
     dossierParlementaireBySenatChemin: I,
     dossierParlementaireByTitreChemin: L,
     dossierParlementaireByUid: D,
@@ -2007,9 +2007,9 @@ function yn(t, n, i) {
     return;
   const _ = r.readJsonSync(f);
   for (const m of i)
-    for (const { filename: S, url: v } of _[m] ?? [])
+    for (const { filename: S, url: C } of _[m] ?? [])
       if (S !== void 0)
-        return { format: m, path: s.join(p, S), url: v };
+        return { format: m, path: s.join(p, S), url: C };
 }
 function An(t, n, { log: i = !1 } = {}) {
   const o = s.join(
@@ -2022,7 +2022,7 @@ function An(t, n, { log: i = !1 } = {}) {
   const p = r.readFileSync(o, { encoding: "utf8" });
   return JSON.parse(p);
 }
-function vn(t, { log: n = !1 } = {}) {
+function Cn(t, { log: n = !1 } = {}) {
   const i = s.join(
     t,
     "photos_senateurs",
@@ -2051,14 +2051,14 @@ function Yt(t, n) {
   ), S = o.etat;
   if (S === void 0)
     return r.ensureDirSync(m), s.join(m, n);
-  const v = s.join(m, S);
-  let C = "000000" + (o.numero ?? o.numero2);
-  C = C.substring(C.length - 6);
-  const I = s.join(v, C.substring(0, 3));
+  const C = s.join(m, S);
+  let v = "000000" + (o.numero ?? o.numero2);
+  v = v.substring(v.length - 6);
+  const I = s.join(C, v.substring(0, 3));
   return r.ensureDirSync(I), s.join(I, n);
 }
-function Cn(t, n) {
-  return ve(t, n, Te);
+function vn(t, n) {
+  return Ce(t, n, Te);
 }
 function In(t, n) {
   const i = Ne.exec(n);
@@ -2070,8 +2070,8 @@ function In(t, n) {
   const o = s.join(t, i[1]), p = s.join(o, i[2]), f = s.join(p, i[3]), _ = s.join(f, i[4]), m = s.join(_, i[5]);
   let S = "000000000" + i[6];
   S = S.substring(S.length - 9);
-  const v = s.join(m, S.substring(0, 3)), C = s.join(v, S.substring(3, 3));
-  return r.ensureDirSync(C), s.join(C, n);
+  const C = s.join(m, S.substring(0, 3)), v = s.join(C, S.substring(3, 3));
+  return r.ensureDirSync(v), s.join(v, n);
 }
 function Fn(t, n) {
   const i = ze.exec(n);
@@ -2087,7 +2087,7 @@ function Fn(t, n) {
   return r.ensureDirSync(m), s.join(m, n);
 }
 function Vn(t, n) {
-  return ve(t, n, Ue);
+  return Ce(t, n, Ue);
 }
 function Dn(t, n) {
   const i = ke.exec(n);
@@ -2099,10 +2099,10 @@ function Dn(t, n) {
   const o = s.join(t, i[2]), p = s.join(o, i[3]), f = s.join(p, i[4]), _ = s.join(f, i[5]);
   let m = "000000000" + i[7];
   m = m.substring(m.length - 9);
-  const S = s.join(_, m.substring(0, 3)), v = s.join(S, m.substring(3, 3));
-  return r.ensureDirSync(v), s.join(v, n);
+  const S = s.join(_, m.substring(0, 3)), C = s.join(S, m.substring(3, 3));
+  return r.ensureDirSync(C), s.join(C, n);
 }
-function ve(t, n, i) {
+function Ce(t, n, i) {
   const o = i.exec(n);
   B.notStrictEqual(
     o,
@@ -2138,10 +2138,10 @@ export {
   bn as loadAssembleeDataFromBigFiles,
   yn as loadAssembleeDocumentFile,
   An as loadAssembleePhotosDeputes,
-  vn as loadAssembleePhotosSenateurs,
+  Cn as loadAssembleePhotosSenateurs,
   Dn as pathFromCompteRenduUid,
   Yt as pathFromDocumentUid,
-  Cn as pathFromDossierParlementaireUid,
+  vn as pathFromDossierParlementaireUid,
   Vn as pathFromQuestionUid,
   In as pathFromReunionUid,
   Fn as pathFromScrutinUid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/assemblee",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "description": "Retrieve, clean up & handle French Assemblée nationale's open data",
   "keywords": [
     "Assemblée nationale",