@tricoteuses/assemblee 2.1.2 → 2.2.1

package/LICENSE.md

@@ -12,7 +12,7 @@ Copyright:
 * © 2022 Emmanuel Raviart
 * © 2023 Henry Boisgibault & Emmanuel Raviart
 
-https://git.en-root.org/tricoteuses/tricoteuses-assemblee
+https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee
 
 > Tricoteuses-Assemblee is free software; you can redistribute it and/or modify
 > it under the terms of the GNU Affero General Public License as

package/README.md

@@ -4,8 +4,8 @@
 
 _Tricoteuses Légifrance_ is free and open source software.
 
-- [software repository](https://git.en-root.org/tricoteuses/tricoteuses-assemblee)
-- [GNU Affero General Public License version 3 or greater](https://git.en-root.org/tricoteuses/tricoteuses-assemblee/-/tree/master/LICENSE.md)
+- [software repository](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee)
+- [GNU Affero General Public License version 3 or greater](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee/-/tree/master/LICENSE.md)
 
 ## documentation
 
@@ -30,7 +30,7 @@ _Tricoteuses Légifrance_ is free and open source software.
 ## Installation
 
 ```bash
-git clone https://git.en-root.org/tricoteuses/tricoteuses-assemblee
+git clone https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee
 cd tricoteuses-assemblee/
 ```
 
@@ -91,17 +91,11 @@ If you use such options, use them in all subsequent commands too (_data:regorgan
 
 ## Download using Docker
 
-A Docker image that downloads and cleans the data all at once is available. Build it locally or pull it from the container registry :
+A Docker image that downloads and cleans the data all at once is available. Build it locally or run it from the container registry.
+Use the environment variables `LEGISLATURE` and `CATEGORIES` if needed.
 
 ```bash
-docker pull registry.en-root.org/tricoteuses/tricoteuses-assemblee:latest
-```
-
-Create a volume to download the data and use the environment variables `LEGISLATURE` and `CATEGORIES` if needed :
-
-```bash
-docker volume create assemblee-data
-docker run --name tricoteuses-assemblee -v assemblee-data:/app/assemblee -e LEGISLATURE=17 -d registry.en-root.org/tricoteuses/tricoteuses-assemblee:latest
+docker run --pull always --name tricoteuses-assemblee -v ../assemblee-data:/app/assemblee-data -e LEGISLATURE=17 -d git.tricoteuses.fr/logiciels/tricoteuses-assemblee:latest
 ```
 
 ## Using the data
@@ -134,4 +128,4 @@ for (const { acteur } of iterLoadAssembleeActeurs("../assemblee-data", 17)) {
 
 ## Generating schemas and documentation (for contributors only)
 
-View instructions [here](https://git.en-root.org/tricoteuses/tricoteuses-assemblee/-/blob/master/src/types)
+View instructions [here](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee/-/blob/master/src/types)

package/lib/cleaners.js

@@ -1,5 +1,5 @@
 import t from "node:assert";
-import { c as f, a as S, b as _ } from "./amendements-DcffXOt8.js";
+import { c as f, a as b, b as _ } from "./amendements-DcffXOt8.js";
 import { d as Y } from "./amendements-DcffXOt8.js";
 function $(e) {
   f(e), t.strictEqual(e.uid["@xsi:type"], "IdActeur_type"), e.uid = e.uid["#text"], t(e.uid);
@@ -58,22 +58,22 @@ function $(e) {
         const D = R.lieu;
         f(D);
       }
-      const q = s.mandature;
-      q !== void 0 && f(q), t.strictEqual(s.chambre, void 0);
+      const O = s.mandature;
+      O !== void 0 && f(O), t.strictEqual(s.chambre, void 0);
       let y = s.collaborateurs;
       if (y !== void 0) {
         const D = Array.isArray(y) ? y.filter((A) => A !== null) : [y];
         y = [], D.map(({ collaborateur: A }) => {
           if (Array.isArray(A))
-            for (const O of A)
-              O !== null && y.push(O);
+            for (const q of A)
+              q !== null && y.push(q);
           else A && y.push(A);
         }), y.length === 0 ? (delete s.collaborateurs, y = void 0) : s.collaborateurs = y;
         for (const A of y || [])
           f(A), t.strictEqual(A.dateDebut, void 0), t.strictEqual(A.dateFin, void 0);
       }
-      const E = s.InfosHorsSIAN;
-      E !== void 0 && (f(E), t.strictEqual(E.HATVP_URI, void 0), t.strictEqual(Object.keys(E).length, 0), delete s.InfosHorsSIAN);
+      const x = s.InfosHorsSIAN;
+      x !== void 0 && (f(x), t.strictEqual(x.HATVP_URI, void 0), t.strictEqual(Object.keys(x).length, 0), delete s.InfosHorsSIAN);
     }
     l.sort(
       (s, u) => s.uid.length === u.uid.length ? s.uid.localeCompare(u.uid) : s.uid.length - u.uid.length
@@ -129,28 +129,28 @@ function w(e) {
     }
   }
   const p = e.notice;
-  S(p, "adoptionConforme");
+  b(p, "adoptionConforme");
   let o = e.coSignataires;
   if (o !== void 0) {
     o = o.coSignataire, Array.isArray(o) || (t(o), o = [o]), e.coSignataires = o;
     for (const i of o) {
-      f(i), S(i, "edite");
+      f(i), b(i, "edite");
       let a = i.acteur;
       a !== void 0 && (a = a.acteurRef, t(a), delete i.acteur, i.acteurRef = a);
       const v = i.organe;
-      v !== void 0 && S(v, "etApparentes");
+      v !== void 0 && b(v, "etApparentes");
     }
   }
   const s = e.depotAmendements;
   if (s !== void 0) {
     f(s);
     const i = s.amendementsSeance;
-    f(i), S(i, "amendable");
+    f(i), b(i, "amendable");
     let a = s.amendementsCommission;
     if (a !== void 0) {
       a = a.commission, Array.isArray(a) || (t(a), a = [a]), s.amendementsCommission = a;
       for (const v of a)
-        f(v), S(v, "amendable"), t.strictEqual(v.dateLimiteDepot, void 0);
+        f(v), b(v, "amendable"), t.strictEqual(v.dateLimiteDepot, void 0);
     }
   }
   const u = e.imprimerie;
@@ -159,9 +159,11 @@ function w(e) {
     const i = u.DIAN;
     i !== void 0 && (delete u.DIAN, u.dian = i);
     const a = u.ISBN;
-    a !== void 0 && (delete u.ISBN, u.isbn = a), t.strictEqual(u.ISSN, void 0);
+    a !== void 0 && (delete u.ISBN, u.isbn = a);
+    const v = u.ISSN;
+    v !== void 0 && (delete u.ISSN, u.issn = v);
   }
-  S(e, "rapportPublie");
+  b(e, "rapportPublie");
   let m = e.organesReferents;
   m !== void 0 && (m = m.organeRef, Array.isArray(m) || (t(m), m = [m]), e.organesReferents = m);
 }
@@ -182,16 +184,16 @@ function j(e) {
   const o = e.infoJOCE;
   if (o !== void 0) {
     e.infoJoce = o, delete e.infoJOCE;
-    const b = o.refJOCE;
-    b !== void 0 && (o.refJoce = b, delete o.refJOCE);
+    const S = o.refJOCE;
+    S !== void 0 && (o.refJoce = S, delete o.refJOCE);
     const h = o.dateJOCE;
     h !== void 0 && (o.dateJoce = h, delete o.dateJOCE);
   }
   let s = e.infoJORect;
   if (s !== void 0) {
     Array.isArray(s) || (s = [s]), e.infoJoRect = s, delete e.infoJORect;
-    for (const b of s)
-      P(b);
+    for (const S of s)
+      P(S);
   }
   F(e);
   let u = e.initiateurs;
@@ -203,8 +205,8 @@ function j(e) {
   let i = e.rapporteurs;
   if (i !== void 0) {
     i = i.rapporteur, Array.isArray(i) || (t(i), i = [i]), e.rapporteurs = i;
-    for (const b of i)
-      C(b);
+    for (const S of i)
+      C(S);
   }
   const a = e.referenceNOR;
   a !== void 0 && (e.referenceNor = a, delete e.referenceNOR), t.strictEqual(e.reunion, void 0);
@@ -212,31 +214,31 @@ function j(e) {
   v !== void 0 && V(v);
   const R = e.statutConclusion;
   R !== void 0 && (V(R), R.famCode === "TSORTFnull" && delete e.statutConclusion);
-  const q = e.texteAdopte;
-  q !== void 0 && (delete e.texteAdopte, e.texteAdopteRef = q);
+  const O = e.texteAdopte;
+  O !== void 0 && (delete e.texteAdopte, e.texteAdopteRef = O);
   const y = e.texteAssocie;
   y !== void 0 && (delete e.texteAssocie, e.texteAssocieRef = y);
-  let E = e.textesAssocies;
-  if (E !== void 0) {
-    E = E.texteAssocie, Array.isArray(E) || (t(E), E = [E]), e.textesAssocies = E;
-    for (const b of E) {
-      const h = b.refTexteAssocie;
-      h !== void 0 && (delete b.refTexteAssocie, b.texteAssocieRef = h);
+  let x = e.textesAssocies;
+  if (x !== void 0) {
+    x = x.texteAssocie, Array.isArray(x) || (t(x), x = [x]), e.textesAssocies = x;
+    for (const S of x) {
+      const h = S.refTexteAssocie;
+      h !== void 0 && (delete S.refTexteAssocie, S.texteAssocieRef = h);
     }
   }
   const D = e.typeDeclaration;
   D !== void 0 && V(D);
   const A = e.typeMotion;
   A !== void 0 && V(A);
-  const O = e.typeMotionCensure;
-  O !== void 0 && V(O);
-  let x = e.voteRefs;
-  x !== void 0 && (x = x.voteRef, Array.isArray(x) || (t(x), x = [x]), e.voteRefs = x);
+  const q = e.typeMotionCensure;
+  q !== void 0 && V(q);
+  let E = e.voteRefs;
+  E !== void 0 && (E = E.voteRef, Array.isArray(E) || (t(E), E = [E]), e.voteRefs = E);
   let J = e.actesLegislatifs;
   if (J !== void 0) {
     J = J.acteLegislatif, Array.isArray(J) || (t(J), J = [J]), e.actesLegislatifs = J;
-    for (const b of J)
-      j(b);
+    for (const S of J)
+      j(S);
   }
 }
 function F(e) {
@@ -332,7 +334,7 @@ function g(e) {
   }
 }
 function U(e) {
-  f(e), S(e, "captationVideo"), S(e, "comiteSecret"), S(e, "ouverturePresse");
+  f(e), b(e, "captationVideo"), b(e, "comiteSecret"), b(e, "ouverturePresse");
   const n = e["@xsi:type"];
   n !== void 0 && (e.xsiType = n, delete e["@xsi:type"]);
   const d = e.timeStampDebut;
@@ -384,8 +386,8 @@ function U(e) {
         for (const v of a) {
           const R = v.uid["@xsi:type"];
           t(R), v.xsiType = R;
-          const q = v.uid["#text"];
-          t(q), v.uid = q;
+          const O = v.uid["#text"];
+          t(O), v.uid = O;
           const y = v.ident;
           t(y), f(y);
         }
@@ -402,20 +404,20 @@ function U(e) {
       v !== void 0 && (Array.isArray(v.item) ? v = v.item : (t(v.item), v = [v.item]), i.resumeOdj = v, delete i.resumeODJ);
       let R = i.pointsODJ;
       if (R !== void 0) {
-        let q = R.pointODJ;
-        Array.isArray(q) ? R = q : (t(q), R = [q]), i.pointsOdj = R;
+        let O = R.pointODJ;
+        Array.isArray(O) ? R = O : (t(O), R = [O]), i.pointsOdj = R;
         for (const y of R) {
-          f(y), S(y, "comiteSecret");
-          const E = y["@xsi:type"];
-          E !== void 0 && (y.xsiType = E, delete y["@xsi:type"]);
+          f(y), b(y, "comiteSecret");
+          const x = y["@xsi:type"];
+          x !== void 0 && (y.xsiType = x, delete y["@xsi:type"]);
           const D = y.cycleDeVie;
           t.notStrictEqual(D, void 0), g(D), t.strictEqual(y.demandeurPoint, void 0);
           let A = y.dossiersLegislatifsRefs;
           A !== void 0 && (Array.isArray(A.dossierRef) ? A = A.dossierRef : (t(A.dossierRef), A = [A.dossierRef]), y.dossiersLegislatifsRefs = A), y.typePointOdj = y.typePointODJ, delete y.typePointODJ, t.strictEqual(y.textesAssocies, void 0), y.natureTravauxOdj = y.natureTravauxODJ, delete y.natureTravauxODJ;
-          let O = y.dateConfPres;
-          O !== void 0 && (t.strictEqual(typeof O, "string"), t(/^\d{4}-\d{2}-\d{2}\+\d{2}:00$/.test(O)), O = new Date(O.split("+")[0]), y.dateConfPres = O);
-          let x = y.dateLettreMinistre;
-          x !== void 0 && (t.strictEqual(typeof x, "string"), t(/^\d{4}-\d{2}-\d{2}\+\d{2}:00$/.test(x)), x = new Date(x.split("+")[0]), y.dateLettreMinistre = x);
+          let q = y.dateConfPres;
+          q !== void 0 && (t.strictEqual(typeof q, "string"), t(/^\d{4}-\d{2}-\d{2}\+\d{2}:00$/.test(q)), q = new Date(q.split("+")[0]), y.dateConfPres = q);
+          let E = y.dateLettreMinistre;
+          E !== void 0 && (t.strictEqual(typeof E, "string"), t(/^\d{4}-\d{2}-\d{2}\+\d{2}:00$/.test(E)), E = new Date(E.split("+")[0]), y.dateLettreMinistre = E);
         }
         delete i.pointsODJ;
       }
@@ -433,7 +435,7 @@ function U(e) {
   }
   const m = e.infosReunionsInternationale;
   if (m !== void 0) {
-    f(m), S(
+    f(m), b(
       m,
       "estReunionInternationale"
     );
@@ -543,7 +545,7 @@ function W(e) {
   }
 }
 function I(e) {
-  S(e, "parDelegation"), _(e, "numPlace");
+  b(e, "parDelegation"), _(e, "numPlace");
 }
 function X(e) {
   f(e);