@tricoteuses/assemblee 2.5.3 → 2.5.5

package/lib/loaders.js

@@ -752,25 +752,18 @@ function* z(t, s, e, r, l, d = "json", { enriched: _ = !1, log: j = !1, noValida
         _ ? "_enrichi" : "_nettoye"
       )
     );
-    for (const V of P(x, l)) {
-      if (!V[V.length - 1].endsWith(".json"))
+    for (const D of P(x, l)) {
+      if (!D[D.length - 1].endsWith(".json"))
         continue;
-      const D = i.join(x, ...V);
-      j && console.log(`Loading file: ${D}…`);
-      let $ = n.readFileSync(D, { encoding: "utf8" }), X;
-      try {
-        X = y ? JSON.parse($) : r($);
-      } catch (p) {
-        console.warn(
-          `[iterLoadAssembleeItems] skipped invalid JSON: ${D} (${p.message})`
-        );
-        continue;
-      }
-      F.has(X.uid) || (F.add(X.uid), yield {
+      const X = i.join(x, ...D);
+      j && console.log(`Loading file: ${X}…`);
+      let V = n.readFileSync(X, { encoding: "utf8" });
+      const $ = y ? JSON.parse(V) : r(V);
+      F.has($.uid) || (F.add($.uid), yield {
         datasetLegislature: v.legislature,
-        filePath: D,
-        item: X
-      }, $ = null);
+        filePath: X,
+        item: $
+      }, V = null);
     }
   }
   F.clear();
@@ -1026,7 +1019,7 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
         v[f.uid] === void 0 && (v[f.uid] = f);
       }
     }
-  const b = {}, x = {}, V = {}, O = {};
+  const b = {}, x = {}, D = {}, O = {};
   if (s & I.DossiersLegislatifs)
     for (const o of A.dossiersLegislatifs) {
       if (o.ignoreForWeb || e !== a.All && o.legislature !== a.All && e !== o.legislature)
@@ -1053,10 +1046,10 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
         const S = n.readFileSync(g, {
           encoding: "utf8"
         }), f = R.toDossierParlementaire(S), L = f.titreDossier;
-        L.senatChemin && x[L.senatChemin] === void 0 && (x[L.senatChemin] = f), L.titreChemin && V[L.titreChemin] === void 0 && (V[L.titreChemin] = f), O[f.uid] === void 0 && (O[f.uid] = f);
+        L.senatChemin && x[L.senatChemin] === void 0 && (x[L.senatChemin] = f), L.titreChemin && D[L.titreChemin] === void 0 && (D[L.titreChemin] = f), O[f.uid] === void 0 && (O[f.uid] = f);
       }
     }
-  let D = {};
+  let X = {};
   if (s & I.Photos) {
     {
       const o = i.join(
@@ -1068,7 +1061,7 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
       if (n.existsSync(o)) {
         l && console.log(`Loading file: ${o}`);
         const m = n.readFileSync(o, { encoding: "utf8" });
-        Object.assign(D, JSON.parse(m));
+        Object.assign(X, JSON.parse(m));
       } else l && console.log(`Ignoring missing file: ${o}`);
     }
     {
@@ -1080,11 +1073,11 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
       if (n.existsSync(o)) {
         l && console.log(`Loading file: ${o}`);
         const m = n.readFileSync(o, { encoding: "utf8" });
-        Object.assign(D, JSON.parse(m));
+        Object.assign(X, JSON.parse(m));
       } else l && console.log(`Ignoring missing file: ${o}`);
     }
   }
-  const $ = {};
+  const V = {};
   if (s & I.Scrutins)
     for (const o of A.scrutins) {
       if (o.ignoreForWeb || e !== a.All && o.legislature !== a.All && e !== o.legislature)
@@ -1101,10 +1094,10 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
         const S = n.readFileSync(g, {
           encoding: "utf8"
         }), f = Z.toScrutin(S);
-        $[f.uid] === void 0 && ($[f.uid] = f);
+        V[f.uid] === void 0 && (V[f.uid] = f);
       }
     }
-  const X = {};
+  const $ = {};
   if (s & I.Questions)
     for (const o of A.questions) {
       if (o.ignoreForWeb || e !== a.All && o.legislature !== a.All && e !== o.legislature)
@@ -1121,7 +1114,7 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
         const S = n.readFileSync(g, {
           encoding: "utf8"
         }), f = B.toQuestion(S);
-        X[f.uid] === void 0 && (X[f.uid] = f);
+        $[f.uid] === void 0 && ($[f.uid] = f);
       }
     }
   const p = {};
@@ -1149,15 +1142,15 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
     amendementByUid: v,
     documentByUid: b,
     dossierParlementaireBySenatChemin: x,
-    dossierParlementaireByTitreChemin: V,
+    dossierParlementaireByTitreChemin: D,
     dossierParlementaireByUid: O,
     organeByUid: _,
-    photoByUid: D,
+    photoByUid: X,
     reunionByUid: j,
     reunionsByDay: y,
     reunionsByDossierUid: F,
-    scrutinByUid: $,
-    questionByUid: X,
+    scrutinByUid: V,
+    questionByUid: $,
     compteRenduByUid: p
   };
 }
@@ -1218,7 +1211,7 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
         for (const g of c.amendements)
           F[g.uid] === void 0 && (F[g.uid] = g);
     }
-  const v = {}, b = {}, x = {}, V = {};
+  const v = {}, b = {}, x = {}, D = {};
   if (s & I.DossiersLegislatifs)
     for (const p of A.dossiersLegislatifs) {
       if (p.ignoreForWeb || e !== a.All && p.legislature !== a.All && e !== p.legislature)
@@ -1233,7 +1226,7 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
         v[c.uid] === void 0 && (v[c.uid] = c);
       for (const c of u.dossiersParlementaires) {
         const g = c.titreDossier;
-        g.senatChemin && b[g.senatChemin] === void 0 && (b[g.senatChemin] = c), g.titreChemin && x[g.titreChemin] === void 0 && (x[g.titreChemin] = c), V[c.uid] === void 0 && (V[c.uid] = c);
+        g.senatChemin && b[g.senatChemin] === void 0 && (b[g.senatChemin] = c), g.titreChemin && x[g.titreChemin] === void 0 && (x[g.titreChemin] = c), D[c.uid] === void 0 && (D[c.uid] = c);
       }
     }
   const O = {};
@@ -1265,7 +1258,7 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
       } else r && console.log(`Ignoring missing file: ${o}`);
     }
   }
-  const D = {};
+  const X = {};
   if (s & I.Scrutins)
     for (const p of A.scrutins) {
       if (p.ignoreForWeb || e !== a.All && p.legislature !== a.All && e !== p.legislature)
@@ -1277,9 +1270,9 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
       r && console.log(`Loading file: ${o}`);
       const m = n.readFileSync(o, { encoding: "utf8" }), u = Z.toScrutins(m);
       for (const c of u.scrutins)
-        D[c.uid] === void 0 && (D[c.uid] = c);
+        X[c.uid] === void 0 && (X[c.uid] = c);
     }
-  const $ = {};
+  const V = {};
   if (s & I.Questions)
     for (const p of A.questions) {
       if (p.ignoreForWeb || e !== a.All && p.legislature !== a.All && e !== p.legislature)
@@ -1291,9 +1284,9 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
       r && console.log(`Loading file: ${o}`);
       const m = n.readFileSync(o, { encoding: "utf8" }), u = B.toQuestions(m);
       for (const c of u.questions)
-        $[c.uid] === void 0 && ($[c.uid] = c);
+        V[c.uid] === void 0 && (V[c.uid] = c);
     }
-  const X = {};
+  const $ = {};
   if (s & I.ComptesRendusSeances)
     for (const p of A.comptesRendusSeances) {
       if (p.ignoreForWeb || e !== a.All && p.legislature !== a.All && e !== p.legislature)
@@ -1305,7 +1298,7 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
       r && console.log(`Loading file: ${o}`);
       const m = n.readFileSync(o, { encoding: "utf8" }), u = J.toComptesRendus(m);
       for (const c of u.comptesRendus)
-        X[c.uid] === void 0 && (X[c.uid] = c);
+        $[c.uid] === void 0 && ($[c.uid] = c);
     }
   return {
     acteurByUid: l,
@@ -1313,15 +1306,15 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
     documentByUid: v,
     dossierParlementaireBySenatChemin: b,
     dossierParlementaireByTitreChemin: x,
-    dossierParlementaireByUid: V,
+    dossierParlementaireByUid: D,
     organeByUid: d,
     photoByUid: O,
     reunionByUid: _,
     reunionsByDay: j,
     reunionsByDossierUid: y,
-    scrutinByUid: D,
-    questionByUid: $,
-    compteRenduByUid: X
+    scrutinByUid: X,
+    questionByUid: V,
+    compteRenduByUid: $
   };
 }
 function be(t, s, e) {

package/package.json

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