@tricoteuses/assemblee 2.5.25 → 2.5.26

package/lib/git.js

@@ -117,9 +117,7 @@ function B(t, o, e = {}) {
     }
     return f;
   } catch {
-    return console.error(
-      `Error getting changed files since commit ${o}`
-    ), /* @__PURE__ */ new Map();
+    return console.error(`Error getting changed files since commit ${o}`), /* @__PURE__ */ new Map();
   }
 }
 export {

package/lib/loaders.d.ts

@@ -1,4 +1,4 @@
-import { EnabledDatasets } from './datasets';
+import { EnabledDatasets, Dataset } from './datasets';
 import { Acteur, Organe, Photo } from './types/acteurs_et_organes';
 import { Reunion } from './types/agendas';
 import { Amendement } from './types/amendements';
@@ -54,55 +54,55 @@ export interface Data {
         [uid: string]: CompteRendu;
     };
 }
-export declare function iterLoadAssembleeActeurs(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeActeurs(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     acteur: Acteur;
     datasetLegislature: Legislature;
     filePath: string;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 }, void, unknown>;
-export declare function iterLoadAssembleeOrganes(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeOrganes(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     organe: Organe;
     datasetLegislature: Legislature;
     filePath: string;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 }, void, unknown>;
-export declare function iterLoadAssembleeAmendements(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeAmendements(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     amendement: Amendement;
     datasetLegislature: Legislature;
     filePath: string;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 }, void, unknown>;
-export declare function iterLoadAssembleeDocuments(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeDocuments(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     document: Document;
     datasetLegislature: Legislature;
     filePath: string;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 }, void, unknown>;
-export declare function iterLoadAssembleeDossiersParlementaires(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeDossiersParlementaires(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     dossierParlementaire: DossierParlementaire;
     datasetLegislature: Legislature;
     filePath: string;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 }, void, unknown>;
-export declare function iterLoadAssembleeReunions(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeReunions(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     reunion: Reunion;
     datasetLegislature: Legislature;
     filePath: string;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 }, void, unknown>;
-export declare function iterLoadAssembleeScrutins(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeScrutins(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     scrutin: Scrutin;
     datasetLegislature: Legislature;
     filePath: string;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 }, void, unknown>;
-export declare function iterLoadAssembleeQuestions(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeQuestions(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     question: Question;
     datasetLegislature: Legislature;
     filePath: string;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 }, void, unknown>;
-export declare function iterLoadAssembleeComptesRendus(dataDir: string, legislature: Legislature, options?: {}): Generator<{
+export declare function iterLoadAssembleeComptesRendus(dataDir: string, legislature: Legislature, options?: {}, customDatasets?: Dataset[]): Generator<{
     compteRendu: CompteRendu;
     datasetLegislature: Legislature;
     filePath: string;

package/lib/loaders.js

@@ -1,18 +1,18 @@
 import E from "node:assert";
-import m from "fs-extra";
+import g from "fs-extra";
 import s from "node:path";
-import { a1 as F, a2 as P, L as g, a3 as W, a4 as M, a5 as J, a6 as w, a7 as T, a8 as Q, Y as Z, $ as G, a0 as H, X as K, Z as ee, _ as ne } from "./datasets-BCg11CdK.js";
+import { a1 as F, a2 as P, L as j, a3 as W, a4 as M, a5 as J, a6 as w, a7 as T, a8 as Q, Y as Z, $ as G, a0 as H, X as K, Z as ee, _ as ne } from "./datasets-BCg11CdK.js";
 import "glob";
 import { getChangedFilesSinceCommit as V } from "./git.js";
 import { C as X } from "./amendements-40Z7OJLT.js";
 function* R(t, o = []) {
   const e = s.join(t, ...o);
-  if (m.existsSync(e))
-    for (const i of m.readdirSync(e)) {
+  if (g.existsSync(e))
+    for (const i of g.readdirSync(e)) {
       if (i[0] === ".")
         continue;
       const u = s.join(e, i), f = [...o, i];
-      m.statSync(u).isDirectory() ? yield* R(t, f) : yield f;
+      g.statSync(u).isDirectory() ? yield* R(t, f) : yield f;
     }
 }
 const I = [
@@ -54,7 +54,7 @@ function oe(t) {
       o += I[e + 1], t -= I[e];
   return o;
 }
-function* B(t, o, e, i, u, f = "json", { log: l = !1, noValidation: h = !1, sinceCommits: y } = {}) {
+function* B(t, o, e, i, u, f = "json", { log: d = !1, noValidation: l = !1, sinceCommits: y } = {}) {
   const A = /* @__PURE__ */ new Set();
   for (const S of e) {
     if (S.ignoreForWeb || !ie(o, S))
@@ -65,7 +65,7 @@ function* B(t, o, e, i, u, f = "json", { log: l = !1, noValidation: h = !1, sinc
     ), $ = y ? y[S.name] : void 0, x = $ ? V(L, $, {
       diffFilter: "AMR"
     }) : null;
-    l && $ && (console.log(
+    d && $ && (console.log(
       `Filtering files changed since commit ${$} in ${L}`
     ), console.log(`Found ${x?.size || 0} changed files`));
     for (const b of R(L, u)) {
@@ -74,9 +74,9 @@ function* B(t, o, e, i, u, f = "json", { log: l = !1, noValidation: h = !1, sinc
       const D = s.join(L, ...b), n = s.join(...b), c = x?.get(n);
       if (x && !c)
         continue;
-      l && console.log(`Loading file: ${D}…`);
-      let a = m.readFileSync(D, { encoding: "utf8" });
-      const p = h ? JSON.parse(a) : i(a);
+      d && console.log(`Loading file: ${D}…`);
+      let a = g.readFileSync(D, { encoding: "utf8" });
+      const p = l ? JSON.parse(a) : i(a);
       A.has(p.uid) || (A.add(p.uid), yield {
         datasetLegislature: S.legislature,
         filePath: D,
@@ -94,7 +94,7 @@ function* B(t, o, e, i, u, f = "json", { log: l = !1, noValidation: h = !1, sinc
       );
       for (const [C, D] of b.entries()) {
         const n = s.join(L, C);
-        l && console.log(`Deleted file: ${n}`);
+        d && console.log(`Deleted file: ${n}`);
         const a = { uid: s.basename(C, `.${f}`) };
         yield {
           datasetLegislature: S.legislature,
@@ -109,212 +109,212 @@ function* B(t, o, e, i, u, f = "json", { log: l = !1, noValidation: h = !1, sinc
 }
 function ie(t, o) {
   const e = Array.isArray(t) ? t : t !== void 0 ? [t] : [];
-  return t === void 0 || e.includes(0) || o.legislature === g.All ? !0 : e.includes(o.legislature);
+  return t === void 0 || e.includes(0) || o.legislature === j.All ? !0 : e.includes(o.legislature);
 }
-function* de(t, o, e = {}) {
+function* de(t, o, e = {}, i) {
   for (const {
-    datasetLegislature: i,
-    item: u,
-    filePath: f,
+    datasetLegislature: u,
+    item: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.acteursEtOrganes,
+    i ?? F.acteursEtOrganes,
     W.toActeur,
     ["acteurs"],
     "json",
     e
   ))
     yield {
-      acteur: u,
-      datasetLegislature: i,
-      filePath: f,
+      acteur: f,
+      datasetLegislature: u,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
-function* me(t, o, e = {}) {
+function* me(t, o, e = {}, i) {
   for (const {
-    item: i,
-    datasetLegislature: u,
-    filePath: f,
+    item: u,
+    datasetLegislature: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.acteursEtOrganes,
+    i ?? F.acteursEtOrganes,
     W.toOrgane,
     ["organes"],
     "json",
     e
   ))
     yield {
-      organe: i,
-      datasetLegislature: u,
-      filePath: f,
+      organe: u,
+      datasetLegislature: f,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
-function* ge(t, o, e = {}) {
+function* ge(t, o, e = {}, i) {
   for (const {
-    datasetLegislature: i,
-    item: u,
-    filePath: f,
+    datasetLegislature: u,
+    item: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.amendements,
+    i ?? F.amendements,
     X.toAmendement,
     [],
     "json",
     e
   ))
     yield {
-      amendement: u,
-      datasetLegislature: i,
-      filePath: f,
+      amendement: f,
+      datasetLegislature: u,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
-function* je(t, o, e = {}) {
+function* je(t, o, e = {}, i) {
   for (const {
-    item: i,
-    datasetLegislature: u,
-    filePath: f,
+    item: u,
+    datasetLegislature: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.dossiersLegislatifs,
+    i ?? F.dossiersLegislatifs,
     J.toDocument,
     ["documents"],
     "json",
     e
   ))
     yield {
-      document: i,
-      datasetLegislature: u,
-      filePath: f,
+      document: u,
+      datasetLegislature: f,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
-function* he(t, o, e = {}) {
+function* he(t, o, e = {}, i) {
   for (const {
-    item: i,
-    datasetLegislature: u,
-    filePath: f,
+    item: u,
+    datasetLegislature: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.dossiersLegislatifs,
+    i ?? F.dossiersLegislatifs,
     J.toDossierParlementaire,
     ["dossiers"],
     "json",
     e
   ))
     yield {
-      dossierParlementaire: i,
-      datasetLegislature: u,
-      filePath: f,
+      dossierParlementaire: u,
+      datasetLegislature: f,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
-function* pe(t, o, e = {}) {
+function* pe(t, o, e = {}, i) {
   for (const {
-    item: i,
-    datasetLegislature: u,
-    filePath: f,
+    item: u,
+    datasetLegislature: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.agendas,
+    i ?? F.agendas,
     M.toReunion,
     [],
     "json",
     e
   ))
     yield {
-      reunion: i,
-      datasetLegislature: u,
-      filePath: f,
+      reunion: u,
+      datasetLegislature: f,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
-function* ye(t, o, e = {}) {
+function* ye(t, o, e = {}, i) {
   for (const {
-    item: i,
-    datasetLegislature: u,
-    filePath: f,
+    item: u,
+    datasetLegislature: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.scrutins,
+    i ?? F.scrutins,
     w.toScrutin,
     [],
     "json",
     e
   ))
     yield {
-      scrutin: i,
-      datasetLegislature: u,
-      filePath: f,
+      scrutin: u,
+      datasetLegislature: f,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
-function* Fe(t, o, e = {}) {
+function* Fe(t, o, e = {}, i) {
   for (const {
-    item: i,
-    datasetLegislature: u,
-    filePath: f,
+    item: u,
+    datasetLegislature: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.questions,
+    i ?? F.questions,
     T.toQuestion,
     [],
     "json",
     e
   ))
     yield {
-      question: i,
-      datasetLegislature: u,
-      filePath: f,
+      question: u,
+      datasetLegislature: f,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
-function* Se(t, o, e = {}) {
+function* Se(t, o, e = {}, i) {
   for (const {
-    item: i,
-    datasetLegislature: u,
-    filePath: f,
+    item: u,
+    datasetLegislature: f,
+    filePath: d,
     gitStatus: l
   } of B(
     t,
     o,
-    F.comptesRendusSeances,
+    i ?? F.comptesRendusSeances,
     Q.toCompteRendu,
     [],
     "xml",
     e
   ))
     yield {
-      compteRendu: i,
-      datasetLegislature: u,
-      filePath: f,
+      compteRendu: u,
+      datasetLegislature: f,
+      filePath: d,
       ...l && { gitStatus: l }
     };
 }
 function* Ae(t, o, {} = {}) {
   const e = `Comptes_Rendus_Commissions_${oe(o)}_nettoye`, i = s.join(t, e);
-  if (m.existsSync(i))
+  if (g.existsSync(i))
     for (const u of z(i))
       try {
-        const f = m.readFileSync(u, "utf-8");
+        const f = g.readFileSync(u, "utf-8");
         yield {
           compteRendu: JSON.parse(f),
           datasetLegislature: o,
@@ -325,8 +325,8 @@ function* Ae(t, o, {} = {}) {
       }
 }
 function* z(t) {
-  if (m.existsSync(t))
-    for (const o of m.readdirSync(t, { withFileTypes: !0 })) {
+  if (g.existsSync(t))
+    for (const o of g.readdirSync(t, { withFileTypes: !0 })) {
       const e = s.join(t, o.name);
       o.isDirectory() ? yield* z(e) : o.isFile() && e.endsWith(".json") && (yield e);
     }
@@ -335,7 +335,7 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
   const u = {}, f = {};
   if (o & P.ActeursEtOrganes)
     for (const n of F.acteursEtOrganes) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
@@ -346,26 +346,26 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = W.toActeur(j);
-        u[d.uid] === void 0 && (u[d.uid] = d);
+        }), m = W.toActeur(h);
+        u[m.uid] === void 0 && (u[m.uid] = m);
       }
       for (const a of R(c, ["organes"])) {
         if (!a[a.length - 1].endsWith(".json"))
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = W.toOrgane(j);
-        f[d.uid] === void 0 && (f[d.uid] = d);
+        }), m = W.toOrgane(h);
+        f[m.uid] === void 0 && (f[m.uid] = m);
       }
     }
-  const l = {}, h = {}, y = {};
+  const d = {}, l = {}, y = {};
   if (o & P.Agendas)
     for (const n of F.agendas) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
@@ -376,26 +376,26 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = M.toReunion(j);
-        l[d.uid] === void 0 && (l[d.uid] = d);
-        const v = d.timestampDebut.toISOString().split("T")[0];
-        let O = h[v];
-        O === void 0 && (O = h[v] = []), O.push(d);
-        const _ = d.odj;
+        }), m = M.toReunion(h);
+        d[m.uid] === void 0 && (d[m.uid] = m);
+        const v = m.timestampDebut.toISOString().split("T")[0];
+        let O = l[v];
+        O === void 0 && (O = l[v] = []), O.push(m);
+        const _ = m.odj;
         if (_ !== void 0)
           for (const q of _.pointsOdj || [])
             for (const k of q.dossiersLegislatifsRefs || []) {
               let N = y[k];
-              N === void 0 && (N = y[k] = []), N.push(d);
+              N === void 0 && (N = y[k] = []), N.push(m);
             }
       }
     }
   const A = {};
   if (o & P.Amendements)
     for (const n of F.amendements) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
@@ -406,16 +406,16 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = X.toAmendement(j);
-        A[d.uid] === void 0 && (A[d.uid] = d);
+        }), m = X.toAmendement(h);
+        A[m.uid] === void 0 && (A[m.uid] = m);
       }
     }
   const S = {}, U = {}, L = {}, $ = {};
   if (o & P.DossiersLegislatifs)
     for (const n of F.dossiersLegislatifs) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
@@ -426,20 +426,20 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = J.toDocument(j);
-        S[d.uid] === void 0 && (S[d.uid] = d);
+        }), m = J.toDocument(h);
+        S[m.uid] === void 0 && (S[m.uid] = m);
       }
       for (const a of R(c, ["dossiers"])) {
         if (!a[a.length - 1].endsWith(".json"))
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = J.toDossierParlementaire(j), v = d.titreDossier;
-        v.senatChemin && U[v.senatChemin] === void 0 && (U[v.senatChemin] = d), v.titreChemin && L[v.titreChemin] === void 0 && (L[v.titreChemin] = d), $[d.uid] === void 0 && ($[d.uid] = d);
+        }), m = J.toDossierParlementaire(h), v = m.titreDossier;
+        v.senatChemin && U[v.senatChemin] === void 0 && (U[v.senatChemin] = m), v.titreChemin && L[v.titreChemin] === void 0 && (L[v.titreChemin] = m), $[m.uid] === void 0 && ($[m.uid] = m);
       }
     }
   let x = {};
@@ -448,12 +448,12 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
       const n = s.join(
         t,
         `photos_deputes_${// TODO: Handle Legislature.All.
-        e === g.All ? g.DixSept : e}`,
+        e === j.All ? j.DixSept : e}`,
         "deputes.json"
       );
-      if (m.existsSync(n)) {
+      if (g.existsSync(n)) {
         i && console.log(`Loading file: ${n}`);
-        const c = m.readFileSync(n, { encoding: "utf8" });
+        const c = g.readFileSync(n, { encoding: "utf8" });
         Object.assign(x, JSON.parse(c));
       } else i && console.log(`Ignoring missing file: ${n}`);
     }
@@ -463,9 +463,9 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
         "photos_senateurs",
         "senateurs.json"
       );
-      if (m.existsSync(n)) {
+      if (g.existsSync(n)) {
         i && console.log(`Loading file: ${n}`);
-        const c = m.readFileSync(n, { encoding: "utf8" });
+        const c = g.readFileSync(n, { encoding: "utf8" });
         Object.assign(x, JSON.parse(c));
       } else i && console.log(`Ignoring missing file: ${n}`);
     }
@@ -473,7 +473,7 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
   const b = {};
   if (o & P.Scrutins)
     for (const n of F.scrutins) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
@@ -484,16 +484,16 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = w.toScrutin(j);
-        b[d.uid] === void 0 && (b[d.uid] = d);
+        }), m = w.toScrutin(h);
+        b[m.uid] === void 0 && (b[m.uid] = m);
       }
     }
   const C = {};
   if (o & P.Questions)
     for (const n of F.questions) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
@@ -504,16 +504,16 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = T.toQuestion(j);
-        C[d.uid] === void 0 && (C[d.uid] = d);
+        }), m = T.toQuestion(h);
+        C[m.uid] === void 0 && (C[m.uid] = m);
       }
     }
   const D = {};
   if (o & P.ComptesRendusSeances)
     for (const n of F.comptesRendusSeances) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
@@ -524,10 +524,10 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
           continue;
         const r = s.join(c, ...a);
         i && console.log(`Loading file: ${r}…`);
-        const j = m.readFileSync(r, {
+        const h = g.readFileSync(r, {
           encoding: "utf8"
-        }), d = Q.toCompteRendu(j);
-        D[d.uid] === void 0 && (D[d.uid] = d);
+        }), m = Q.toCompteRendu(h);
+        D[m.uid] === void 0 && (D[m.uid] = m);
       }
     }
   return {
@@ -539,8 +539,8 @@ function Pe(t, o, e, { log: i = !1 } = {}) {
     dossierParlementaireByUid: $,
     organeByUid: f,
     photoByUid: x,
-    reunionByUid: l,
-    reunionsByDay: h,
+    reunionByUid: d,
+    reunionsByDay: l,
     reunionsByDossierUid: y,
     scrutinByUid: b,
     questionByUid: C,
@@ -551,35 +551,35 @@ function Le(t, o, e, { log: i = !1 } = {}) {
   const u = {}, f = {};
   if (o & P.ActeursEtOrganes)
     for (const n of F.acteursEtOrganes) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       i && console.log(`Loading file: ${c}`);
-      const a = m.readFileSync(c, { encoding: "utf8" }), p = W.toActeursEtOrganes(a);
+      const a = g.readFileSync(c, { encoding: "utf8" }), p = W.toActeursEtOrganes(a);
       for (const r of p.acteurs)
         u[r.uid] === void 0 && (u[r.uid] = r);
       for (const r of p.organes)
         f[r.uid] === void 0 && (f[r.uid] = r);
     }
-  const l = {}, h = {}, y = {};
+  const d = {}, l = {}, y = {};
   if (o & P.Agendas)
     for (const n of F.agendas) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       i && console.log(`Loading file: ${c}`);
-      const a = m.readFileSync(c, { encoding: "utf8" }), p = M.toAgendas(a);
+      const a = g.readFileSync(c, { encoding: "utf8" }), p = M.toAgendas(a);
       for (const r of p.reunions) {
-        l[r.uid] === void 0 && (l[r.uid] = r);
-        const j = r.timestampDebut.toISOString().split("T")[0];
-        let d = h[j];
-        d === void 0 && (d = h[j] = []), d.push(r);
+        d[r.uid] === void 0 && (d[r.uid] = r);
+        const h = r.timestampDebut.toISOString().split("T")[0];
+        let m = l[h];
+        m === void 0 && (m = l[h] = []), m.push(r);
         const v = r.odj;
         if (v !== void 0)
           for (const O of v.pointsOdj || [])
@@ -592,34 +592,34 @@ function Le(t, o, e, { log: i = !1 } = {}) {
   const A = {};
   if (o & P.Amendements)
     for (const n of F.amendements) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       i && console.log(`Loading file: ${c}`);
-      const a = m.readFileSync(c, { encoding: "utf8" }), p = X.toAmendements(a);
+      const a = g.readFileSync(c, { encoding: "utf8" }), p = X.toAmendements(a);
       for (const r of p.textesLegislatifs)
-        for (const j of r.amendements)
-          A[j.uid] === void 0 && (A[j.uid] = j);
+        for (const h of r.amendements)
+          A[h.uid] === void 0 && (A[h.uid] = h);
     }
   const S = {}, U = {}, L = {}, $ = {};
   if (o & P.DossiersLegislatifs)
     for (const n of F.dossiersLegislatifs) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       i && console.log(`Loading file: ${c}`);
-      const a = m.readFileSync(c, { encoding: "utf8" }), p = J.toDossiersLegislatifs(a);
+      const a = g.readFileSync(c, { encoding: "utf8" }), p = J.toDossiersLegislatifs(a);
       for (const r of p.textesLegislatifs)
         S[r.uid] === void 0 && (S[r.uid] = r);
       for (const r of p.dossiersParlementaires) {
-        const j = r.titreDossier;
-        j.senatChemin && U[j.senatChemin] === void 0 && (U[j.senatChemin] = r), j.titreChemin && L[j.titreChemin] === void 0 && (L[j.titreChemin] = r), $[r.uid] === void 0 && ($[r.uid] = r);
+        const h = r.titreDossier;
+        h.senatChemin && U[h.senatChemin] === void 0 && (U[h.senatChemin] = r), h.titreChemin && L[h.titreChemin] === void 0 && (L[h.titreChemin] = r), $[r.uid] === void 0 && ($[r.uid] = r);
       }
     }
   const x = {};
@@ -629,12 +629,12 @@ function Le(t, o, e, { log: i = !1 } = {}) {
       const c = s.join(
         t,
         `photos_deputes_${// TODO: Handle Legislature.All.
-        e === g.All ? g.DixSept : e}`,
+        e === j.All ? j.DixSept : e}`,
         "deputes.json"
       );
-      if (m.existsSync(c)) {
+      if (g.existsSync(c)) {
         i && console.log(`Loading file: ${c}`);
-        const a = m.readFileSync(c, { encoding: "utf8" });
+        const a = g.readFileSync(c, { encoding: "utf8" });
         Object.assign(n, JSON.parse(a));
       } else i && console.log(`Ignoring missing file: ${c}`);
     }
@@ -644,9 +644,9 @@ function Le(t, o, e, { log: i = !1 } = {}) {
         "photos_senateurs",
         "senateurs.json"
       );
-      if (m.existsSync(c)) {
+      if (g.existsSync(c)) {
         i && console.log(`Loading file: ${c}`);
-        const a = m.readFileSync(c, { encoding: "utf8" });
+        const a = g.readFileSync(c, { encoding: "utf8" });
         Object.assign(n, JSON.parse(a));
       } else i && console.log(`Ignoring missing file: ${c}`);
     }
@@ -654,42 +654,42 @@ function Le(t, o, e, { log: i = !1 } = {}) {
   const b = {};
   if (o & P.Scrutins)
     for (const n of F.scrutins) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       i && console.log(`Loading file: ${c}`);
-      const a = m.readFileSync(c, { encoding: "utf8" }), p = w.toScrutins(a);
+      const a = g.readFileSync(c, { encoding: "utf8" }), p = w.toScrutins(a);
       for (const r of p.scrutins)
         b[r.uid] === void 0 && (b[r.uid] = r);
     }
   const C = {};
   if (o & P.Questions)
     for (const n of F.questions) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       i && console.log(`Loading file: ${c}`);
-      const a = m.readFileSync(c, { encoding: "utf8" }), p = T.toQuestions(a);
+      const a = g.readFileSync(c, { encoding: "utf8" }), p = T.toQuestions(a);
       for (const r of p.questions)
         C[r.uid] === void 0 && (C[r.uid] = r);
     }
   const D = {};
   if (o & P.ComptesRendusSeances)
     for (const n of F.comptesRendusSeances) {
-      if (n.ignoreForWeb || e !== g.All && n.legislature !== g.All && e !== n.legislature)
+      if (n.ignoreForWeb || e !== j.All && n.legislature !== j.All && e !== n.legislature)
         continue;
       const c = s.join(
         t,
         n.filename.replace(/\.json$/, "_nettoye.json")
       );
       i && console.log(`Loading file: ${c}`);
-      const a = m.readFileSync(c, { encoding: "utf8" }), p = Q.toComptesRendus(a);
+      const a = g.readFileSync(c, { encoding: "utf8" }), p = Q.toComptesRendus(a);
       for (const r of p.comptesRendus)
         D[r.uid] === void 0 && (D[r.uid] = r);
     }
@@ -702,8 +702,8 @@ function Le(t, o, e, { log: i = !1 } = {}) {
     dossierParlementaireByUid: $,
     organeByUid: f,
     photoByUid: x,
-    reunionByUid: l,
-    reunionsByDay: h,
+    reunionByUid: d,
+    reunionsByDay: l,
     reunionsByDossierUid: y,
     scrutinByUid: b,
     questionByUid: C,
@@ -712,23 +712,23 @@ function Le(t, o, e, { log: i = !1 } = {}) {
 }
 function $e(t, o, e) {
   const i = s.join(t, "Documents"), u = te(i, o), f = s.join(u, "index.json");
-  if (!m.pathExistsSync(f))
+  if (!g.pathExistsSync(f))
     return;
-  const l = m.readJsonSync(f);
-  for (const h of e)
-    for (const { filename: y, url: A } of l[h] ?? [])
+  const d = g.readJsonSync(f);
+  for (const l of e)
+    for (const { filename: y, url: A } of d[l] ?? [])
       if (y !== void 0)
-        return { format: h, path: s.join(u, y), url: A };
+        return { format: l, path: s.join(u, y), url: A };
 }
 function be(t, o, { log: e = !1 } = {}) {
   const i = s.join(
     t,
     `photos_deputes_${// TODO: Handle Legislature.All.
-    o === g.All ? g.DixSept : o}`,
+    o === j.All ? j.DixSept : o}`,
     "deputes.json"
   );
   e && console.log(`Loading file: ${i}`);
-  const u = m.readFileSync(i, { encoding: "utf8" });
+  const u = g.readFileSync(i, { encoding: "utf8" });
   return JSON.parse(u);
 }
 function De(t, { log: o = !1 } = {}) {
@@ -738,7 +738,7 @@ function De(t, { log: o = !1 } = {}) {
     "senateurs.json"
   );
   o && console.log(`Loading file: ${e}`);
-  const i = m.readFileSync(e, { encoding: "utf8" });
+  const i = g.readFileSync(e, { encoding: "utf8" });
   return JSON.parse(i);
 }
 function te(t, o) {
@@ -751,20 +751,20 @@ function te(t, o) {
   const i = e.groups, u = s.join(
     t,
     i.documentType ?? i.documentType2
-  ), f = s.join(u, i.chambre ?? i.chambre2), l = s.join(
+  ), f = s.join(u, i.chambre ?? i.chambre2), d = s.join(
     f,
     i.republique ?? i.republique2
-  ), h = s.join(
-    l,
+  ), l = s.join(
+    d,
     i.legislature ?? i.legislature2
   ), y = i.etat;
   if (y === void 0)
-    return m.ensureDirSync(h), s.join(h, o);
-  const A = s.join(h, y);
+    return g.ensureDirSync(l), s.join(l, o);
+  const A = s.join(l, y);
   let S = "000000" + (i.numero ?? i.numero2);
   S = S.substring(S.length - 6);
   const U = s.join(A, S.substring(0, 3));
-  return m.ensureDirSync(U), s.join(U, o);
+  return g.ensureDirSync(U), s.join(U, o);
 }
 function Ue(t, o) {
   return Y(t, o, ee);
@@ -776,11 +776,11 @@ function ve(t, o) {
     null,
     `Unexpected structure for reunion UID: ${o}`
   );
-  const i = s.join(t, e[1]), u = s.join(i, e[2]), f = s.join(u, e[3]), l = s.join(f, e[4]), h = s.join(l, e[5]);
+  const i = s.join(t, e[1]), u = s.join(i, e[2]), f = s.join(u, e[3]), d = s.join(f, e[4]), l = s.join(d, e[5]);
   let y = "000000000" + e[6];
   y = y.substring(y.length - 9);
-  const A = s.join(h, y.substring(0, 3)), S = s.join(A, y.substring(3, 3));
-  return m.ensureDirSync(S), s.join(S, o);
+  const A = s.join(l, y.substring(0, 3)), S = s.join(A, y.substring(3, 3));
+  return g.ensureDirSync(S), s.join(S, o);
 }
 function Ce(t, o) {
   const e = H.exec(o);
@@ -790,10 +790,10 @@ function Ce(t, o) {
     `Unexpected structure for scrutin UID: ${o}`
   );
   const i = s.join(t, e[1]), u = s.join(i, e[2]), f = s.join(u, e[3]);
-  let l = "000000" + e[4];
-  l = l.substring(l.length - 6);
-  const h = s.join(f, l.substring(0, 3));
-  return m.ensureDirSync(h), s.join(h, o);
+  let d = "000000" + e[4];
+  d = d.substring(d.length - 6);
+  const l = s.join(f, d.substring(0, 3));
+  return g.ensureDirSync(l), s.join(l, o);
 }
 function Re(t, o) {
   return Y(t, o, ne);
@@ -805,11 +805,11 @@ function xe(t, o) {
     null,
     `Unexpected structure for object with UID: ${o}`
   );
-  const i = s.join(t, e[2]), u = s.join(i, e[3]), f = s.join(u, e[4]), l = s.join(f, e[5]);
-  let h = "000000000" + e[7];
-  h = h.substring(h.length - 9);
-  const y = s.join(l, h.substring(0, 3)), A = s.join(y, h.substring(3, 3));
-  return m.ensureDirSync(A), s.join(A, o);
+  const i = s.join(t, e[2]), u = s.join(i, e[3]), f = s.join(u, e[4]), d = s.join(f, e[5]);
+  let l = "000000000" + e[7];
+  l = l.substring(l.length - 9);
+  const y = s.join(d, l.substring(0, 3)), A = s.join(y, l.substring(3, 3));
+  return g.ensureDirSync(A), s.join(A, o);
 }
 function Y(t, o, e) {
   const i = e.exec(o);
@@ -819,10 +819,10 @@ function Y(t, o, e) {
     `Unexpected structure for object with UID: ${o}`
   );
   const u = s.join(t, i[1]), f = s.join(u, i[2]);
-  let l = "000000" + i[3];
-  l = l.substring(l.length - 6);
-  const h = s.join(f, l.substring(0, 3));
-  return m.ensureDirSync(h), s.join(h, o);
+  let d = "000000" + i[3];
+  d = d.substring(d.length - 6);
+  const l = s.join(f, d.substring(0, 3));
+  return g.ensureDirSync(l), s.join(l, o);
 }
 export {
   P as EnabledDatasets,

package/package.json

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