@tricoteuses/assemblee 2.5.27 → 2.5.28

package/lib/loaders.js

@@ -1,7 +1,7 @@
 import E from "node:assert";
 import g from "fs-extra";
 import t from "node:path";
-import { a1 as S, a2 as L, L as j, a3 as _, a4 as M, a5 as J, a6 as N, a7 as Q, a8 as T, Y as X, $ as Y, a0 as Z, X as G, Z as H, _ as K } from "./datasets-CYS3pymi.js";
+import { a1 as F, a2 as L, L as j, a3 as _, a4 as M, a5 as J, a6 as N, a7 as Q, a8 as T, Y as X, $ as Y, a0 as Z, X as G, Z as H, _ as K } from "./datasets-CYS3pymi.js";
 import "glob";
 import { getChangedFilesSinceCommit as z } from "./git.js";
 import { C as w } from "./amendements-40Z7OJLT.js";
@@ -17,11 +17,10 @@ function* C(s, i = []) {
 }
 function* B(s, i, e, o, m, { log: f = !1, noValidation: d = !1, sinceCommits: a } = {}) {
   const p = /* @__PURE__ */ new Set();
-  for (const y of e) {
-    if (y.ignoreForWeb || !ee(i, y))
+  for (const S of e) {
+    if (S.ignoreForWeb || !ee(i, S))
       continue;
-    console.log(y.name);
-    const A = t.join(s, `${y.name}_nettoye`), P = a ? a[y.name] : void 0, R = P ? z(A, P, {
+    const A = t.join(s, `${S.name}_nettoye`), P = a ? a[S.name] : void 0, R = P ? z(A, P, {
       diffFilter: "AMR"
     }) : null;
     f && P && (console.log(
@@ -37,7 +36,7 @@ function* B(s, i, e, o, m, { log: f = !1, noValidation: d = !1, sinceCommits: a
       let n = g.readFileSync(D, { encoding: "utf8" });
       const r = d ? JSON.parse(n) : o(n);
       p.has(r.uid) || (p.add(r.uid), yield {
-        datasetLegislature: y.legislature,
+        datasetLegislature: S.legislature,
         filePath: D,
         item: r,
         ...U && { gitStatus: U }
@@ -56,7 +55,7 @@ function* B(s, i, e, o, m, { log: f = !1, noValidation: d = !1, sinceCommits: a
         f && console.log(`Deleted file: ${b}`);
         const n = { uid: t.parse(x).name };
         yield {
-          datasetLegislature: y.legislature,
+          datasetLegislature: S.legislature,
           filePath: b,
           item: n,
           gitStatus: D
@@ -79,7 +78,7 @@ function* le(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.acteursEtOrganes,
+    o ?? F.acteursEtOrganes,
     _.toActeur,
     ["acteurs"],
     e
@@ -100,7 +99,7 @@ function* ue(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.acteursEtOrganes,
+    o ?? F.acteursEtOrganes,
     _.toOrgane,
     ["organes"],
     e
@@ -121,7 +120,7 @@ function* fe(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.amendements,
+    o ?? F.amendements,
     w.toAmendement,
     [],
     e
@@ -142,7 +141,7 @@ function* de(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.dossiersLegislatifs,
+    o ?? F.dossiersLegislatifs,
     J.toDocument,
     ["documents"],
     e
@@ -163,7 +162,7 @@ function* me(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.dossiersLegislatifs,
+    o ?? F.dossiersLegislatifs,
     J.toDossierParlementaire,
     ["dossiers"],
     e
@@ -184,7 +183,7 @@ function* ge(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.agendas,
+    o ?? F.agendas,
     M.toReunion,
     [],
     e
@@ -205,7 +204,7 @@ function* je(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.scrutins,
+    o ?? F.scrutins,
     N.toScrutin,
     [],
     e
@@ -226,7 +225,7 @@ function* he(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.questions,
+    o ?? F.questions,
     Q.toQuestion,
     [],
     e
@@ -247,7 +246,7 @@ function* pe(s, i, e = {}, o) {
   } of B(
     s,
     i,
-    o ?? S.comptesRendusSeances.concat(S.comptesRendusCommissions),
+    o ?? F.comptesRendusSeances.concat(F.comptesRendusCommissions),
     T.toCompteRendu,
     [],
     e
@@ -262,7 +261,7 @@ function* pe(s, i, e = {}, o) {
 function ye(s, i, e, { log: o = !1 } = {}) {
   const m = {}, f = {};
   if (i & L.ActeursEtOrganes)
-    for (const n of S.acteursEtOrganes) {
+    for (const n of F.acteursEtOrganes) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -292,7 +291,7 @@ function ye(s, i, e, { log: o = !1 } = {}) {
     }
   const d = {}, a = {}, p = {};
   if (i & L.Agendas)
-    for (const n of S.agendas) {
+    for (const n of F.agendas) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -320,9 +319,9 @@ function ye(s, i, e, { log: o = !1 } = {}) {
             }
       }
     }
-  const y = {};
+  const S = {};
   if (i & L.Amendements)
-    for (const n of S.amendements) {
+    for (const n of F.amendements) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -337,12 +336,12 @@ function ye(s, i, e, { log: o = !1 } = {}) {
         const h = g.readFileSync(c, {
           encoding: "utf8"
         }), u = w.toAmendement(h);
-        y[u.uid] === void 0 && (y[u.uid] = u);
+        S[u.uid] === void 0 && (S[u.uid] = u);
       }
     }
   const A = {}, P = {}, R = {}, $ = {};
   if (i & L.DossiersLegislatifs)
-    for (const n of S.dossiersLegislatifs) {
+    for (const n of F.dossiersLegislatifs) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -400,7 +399,7 @@ function ye(s, i, e, { log: o = !1 } = {}) {
   }
   const D = {};
   if (i & L.Scrutins)
-    for (const n of S.scrutins) {
+    for (const n of F.scrutins) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -420,7 +419,7 @@ function ye(s, i, e, { log: o = !1 } = {}) {
     }
   const b = {};
   if (i & L.Questions)
-    for (const n of S.questions) {
+    for (const n of F.questions) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -440,7 +439,7 @@ function ye(s, i, e, { log: o = !1 } = {}) {
     }
   const U = {};
   if (i & L.ComptesRendusSeances)
-    for (const n of S.comptesRendusSeances) {
+    for (const n of F.comptesRendusSeances) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -460,7 +459,7 @@ function ye(s, i, e, { log: o = !1 } = {}) {
     }
   return {
     acteurByUid: m,
-    amendementByUid: y,
+    amendementByUid: S,
     documentByUid: A,
     dossierParlementaireBySenatChemin: P,
     dossierParlementaireByTitreChemin: R,
@@ -478,7 +477,7 @@ function ye(s, i, e, { log: o = !1 } = {}) {
 function Fe(s, i, e, { log: o = !1 } = {}) {
   const m = {}, f = {};
   if (i & L.ActeursEtOrganes)
-    for (const n of S.acteursEtOrganes) {
+    for (const n of F.acteursEtOrganes) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -486,15 +485,15 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       o && console.log(`Loading file: ${r}`);
-      const l = g.readFileSync(r, { encoding: "utf8" }), F = _.toActeursEtOrganes(l);
-      for (const c of F.acteurs)
+      const l = g.readFileSync(r, { encoding: "utf8" }), y = _.toActeursEtOrganes(l);
+      for (const c of y.acteurs)
         m[c.uid] === void 0 && (m[c.uid] = c);
-      for (const c of F.organes)
+      for (const c of y.organes)
         f[c.uid] === void 0 && (f[c.uid] = c);
     }
   const d = {}, a = {}, p = {};
   if (i & L.Agendas)
-    for (const n of S.agendas) {
+    for (const n of F.agendas) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -502,8 +501,8 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       o && console.log(`Loading file: ${r}`);
-      const l = g.readFileSync(r, { encoding: "utf8" }), F = M.toAgendas(l);
-      for (const c of F.reunions) {
+      const l = g.readFileSync(r, { encoding: "utf8" }), y = M.toAgendas(l);
+      for (const c of y.reunions) {
         d[c.uid] === void 0 && (d[c.uid] = c);
         const h = c.timestampDebut.toISOString().split("T")[0];
         let u = a[h];
@@ -517,9 +516,9 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
             }
       }
     }
-  const y = {};
+  const S = {};
   if (i & L.Amendements)
-    for (const n of S.amendements) {
+    for (const n of F.amendements) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -527,14 +526,14 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       o && console.log(`Loading file: ${r}`);
-      const l = g.readFileSync(r, { encoding: "utf8" }), F = w.toAmendements(l);
-      for (const c of F.textesLegislatifs)
+      const l = g.readFileSync(r, { encoding: "utf8" }), y = w.toAmendements(l);
+      for (const c of y.textesLegislatifs)
         for (const h of c.amendements)
-          y[h.uid] === void 0 && (y[h.uid] = h);
+          S[h.uid] === void 0 && (S[h.uid] = h);
     }
   const A = {}, P = {}, R = {}, $ = {};
   if (i & L.DossiersLegislatifs)
-    for (const n of S.dossiersLegislatifs) {
+    for (const n of F.dossiersLegislatifs) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -542,10 +541,10 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       o && console.log(`Loading file: ${r}`);
-      const l = g.readFileSync(r, { encoding: "utf8" }), F = J.toDossiersLegislatifs(l);
-      for (const c of F.textesLegislatifs)
+      const l = g.readFileSync(r, { encoding: "utf8" }), y = J.toDossiersLegislatifs(l);
+      for (const c of y.textesLegislatifs)
         A[c.uid] === void 0 && (A[c.uid] = c);
-      for (const c of F.dossiersParlementaires) {
+      for (const c of y.dossiersParlementaires) {
         const h = c.titreDossier;
         h.senatChemin && P[h.senatChemin] === void 0 && (P[h.senatChemin] = c), h.titreChemin && R[h.titreChemin] === void 0 && (R[h.titreChemin] = c), $[c.uid] === void 0 && ($[c.uid] = c);
       }
@@ -581,7 +580,7 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
   }
   const D = {};
   if (i & L.Scrutins)
-    for (const n of S.scrutins) {
+    for (const n of F.scrutins) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -589,13 +588,13 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       o && console.log(`Loading file: ${r}`);
-      const l = g.readFileSync(r, { encoding: "utf8" }), F = N.toScrutins(l);
-      for (const c of F.scrutins)
+      const l = g.readFileSync(r, { encoding: "utf8" }), y = N.toScrutins(l);
+      for (const c of y.scrutins)
         D[c.uid] === void 0 && (D[c.uid] = c);
     }
   const b = {};
   if (i & L.Questions)
-    for (const n of S.questions) {
+    for (const n of F.questions) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -603,13 +602,13 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       o && console.log(`Loading file: ${r}`);
-      const l = g.readFileSync(r, { encoding: "utf8" }), F = Q.toQuestions(l);
-      for (const c of F.questions)
+      const l = g.readFileSync(r, { encoding: "utf8" }), y = Q.toQuestions(l);
+      for (const c of y.questions)
         b[c.uid] === void 0 && (b[c.uid] = c);
     }
   const U = {};
   if (i & L.ComptesRendusSeances)
-    for (const n of S.comptesRendusSeances) {
+    for (const n of F.comptesRendusSeances) {
       if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const r = t.join(
@@ -617,13 +616,13 @@ function Fe(s, i, e, { log: o = !1 } = {}) {
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       o && console.log(`Loading file: ${r}`);
-      const l = g.readFileSync(r, { encoding: "utf8" }), F = T.toComptesRendus(l);
-      for (const c of F.comptesRendus)
+      const l = g.readFileSync(r, { encoding: "utf8" }), y = T.toComptesRendus(l);
+      for (const c of y.comptesRendus)
         U[c.uid] === void 0 && (U[c.uid] = c);
     }
   return {
     acteurByUid: m,
-    amendementByUid: y,
+    amendementByUid: S,
     documentByUid: A,
     dossierParlementaireBySenatChemin: P,
     dossierParlementaireByTitreChemin: R,
@@ -644,9 +643,9 @@ function Se(s, i, e) {
     return;
   const d = g.readJsonSync(f);
   for (const a of e)
-    for (const { filename: p, url: y } of d[a] ?? [])
+    for (const { filename: p, url: S } of d[a] ?? [])
       if (p !== void 0)
-        return { format: a, path: t.join(m, p), url: y };
+        return { format: a, path: t.join(m, p), url: S };
 }
 function Ae(s, i, { log: e = !1 } = {}) {
   const o = t.join(
@@ -688,10 +687,10 @@ function ne(s, i) {
   ), p = o.etat;
   if (p === void 0)
     return g.ensureDirSync(a), t.join(a, i);
-  const y = t.join(a, p);
+  const S = t.join(a, p);
   let A = "000000" + (o.numero ?? o.numero2);
   A = A.substring(A.length - 6);
-  const P = t.join(y, A.substring(0, 3));
+  const P = t.join(S, A.substring(0, 3));
   return g.ensureDirSync(P), t.join(P, i);
 }
 function Le(s, i) {
@@ -707,7 +706,7 @@ function $e(s, i) {
   const o = t.join(s, e[1]), m = t.join(o, e[2]), f = t.join(m, e[3]), d = t.join(f, e[4]), a = t.join(d, e[5]);
   let p = "000000000" + e[6];
   p = p.substring(p.length - 9);
-  const y = t.join(a, p.substring(0, 3)), A = t.join(y, p.substring(3, 3));
+  const S = t.join(a, p.substring(0, 3)), A = t.join(S, p.substring(3, 3));
   return g.ensureDirSync(A), t.join(A, i);
 }
 function De(s, i) {
@@ -736,8 +735,8 @@ function Ue(s, i) {
   const o = t.join(s, e[2]), m = t.join(o, e[3]), f = t.join(m, e[4]), d = t.join(f, e[5]);
   let a = "000000000" + e[7];
   a = a.substring(a.length - 9);
-  const p = t.join(d, a.substring(0, 3)), y = t.join(p, a.substring(3, 3));
-  return g.ensureDirSync(y), t.join(y, i);
+  const p = t.join(d, a.substring(0, 3)), S = t.join(p, a.substring(3, 3));
+  return g.ensureDirSync(S), t.join(S, i);
 }
 function V(s, i, e) {
   const o = e.exec(i);

package/package.json

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