@tricoteuses/assemblee 2.5.23 → 2.5.24

package/lib/index.js

@@ -1,7 +1,7 @@
 import { c as B, t as x, g as _, m as Q, a as s, b as X, d as V, e as z, f as J, h as Z, i as K, l as ee, j as te, k as ne, w as re, n as U, o as k, p as ie, q as C } from "./parse-Ccs6wcUg.js";
-import { C as O } from "./uids-DaRrTkI-.js";
-import { n as mt, G as gt, b as pt, a as yt, c as ht, H as Rt, I as xt, D as Tt, o as Dt, p as wt, E as vt, F as bt, f as St, L as At, J as Et, K as Ot, O as Ct, U as Mt, M as _t, N as Pt, g as Lt, h as Nt, V as It, P as Bt, i as Ut, j as kt, q as Yt, r as qt, Q as Ft, R as jt, d as $t, k as Wt, S as Ht, s as Gt, t as Qt, u as Xt, v as Vt, w as zt, x as Jt, B as Zt, W as Kt, T as en, y as tn, e as nn, l as rn, A as on, m as an, z as sn, X as un, Y as cn, Z as fn, _ as dn, $ as ln, a0 as mn } from "./uids-DaRrTkI-.js";
-import { A as pn, a as yn, C as hn, b as Rn, c as xn, D as Tn, E as Dn, d as wn, S as vn, T as bn, e as Sn, f as An, g as En } from "./amendements-40Z7OJLT.js";
+import { C as O } from "./uids-CCiVJfZD.js";
+import { n as mt, G as gt, b as pt, a as yt, c as ht, H as Rt, I as xt, D as Tt, o as Dt, p as wt, E as St, F as vt, f as bt, L as At, J as Et, K as Ot, O as Ct, U as Mt, M as _t, N as Pt, g as Lt, h as Nt, V as It, P as Bt, i as Ut, j as kt, q as Yt, r as qt, Q as Ft, R as jt, d as $t, k as Wt, S as Ht, s as Gt, t as Qt, u as Xt, v as Vt, w as zt, x as Jt, B as Zt, W as Kt, T as en, y as tn, e as nn, l as rn, A as on, m as an, z as sn, X as un, Y as cn, Z as fn, _ as dn, $ as ln, a0 as mn } from "./uids-CCiVJfZD.js";
+import { A as pn, a as yn, C as hn, b as Rn, c as xn, D as Tn, E as Dn, d as wn, S as Sn, T as vn, e as bn, f as An, g as En } from "./amendements-40Z7OJLT.js";
 var Y = /* @__PURE__ */ ((e) => (e.Amendements = "amendements", e))(Y || {});
 const Qe = Object.values(Y);
 var q = /* @__PURE__ */ ((e) => (e.Acte_organe = "acte.organe", e.Acte_provenance = "acte.provenance", e.Acte_rapporteurs_acteur = "acte.rapporteurs.acteur", e.Acte_reunion = "acte.reunion", e.Acte_texteAdopte = "acte.texteAdopte", e.Acte_texteAssocie = "acte.texteAssocie", e.Acte_textesAssocies_texteAssocie = "acte.textesAssocies.texteAssocie", e.Acte_votes = "acte.votes", e.Acteur_mandats_organes = "acteur.mandats.organes", e.Amendement_signataires_auteur_acteur = "amendement.signataires.auteur.acteur", e.Amendement_signataires_auteur_auteurRapporteurOrgane = "amendement.signataires.auteur.auteurRapporteurOrgane", e.Amendement_signataires_auteur_gouvernement = "amendement.signataires.auteur.gouvernement", e.Amendement_signataires_auteur_groupePolitique = "amendement.signataires.auteur.groupePolitique", e.Amendement_signataires_cosignataires = "amendement.signataires.cosignataires", e.Amendement_texteLegislatif = "amendement.texteLegislatif", e.Document_auteurs_acteur_acteur = "document.auteurs.acteur.acteur", e.Document_auteurs_organe = "document.auteurs.organe", e.Document_dossier = "document.dossier", e.Dossier_initiateur_acteurs_acteur = "dossier.initiateur.acteurs.acteur", e.Dossier_initiateur_organe = "dossier.initiateur.organe", e.Organe_organeParent = "organe.organeParent", e.Organe_organePrecedent = "organe.organePrecedent", e.Reunion_demandeurs_acteurs_acteur = "reunion.demandeurs.acteurs.acteur", e.Reunion_demandeurs_organe_organe = "reunion.demandeurs.organe.organe", e.Reunion_organeReuni = "reunion.organeReuni", e.Reunion_participants_participantsInternes_acteur = "reunion.participants.participantsInternes.acteur", e.Scrutin_miseAuPoint = "scrutin.miseAuPoint", e.Scrutin_organe = "scrutin.organe", e.Scrutin_ventilationVotes_groupes_organe = "scrutin.ventilationVotes.groupes.organe", e))(q || {});
@@ -710,7 +710,7 @@ function ye(e) {
   const t = e.match(me);
   return t ? t[1].replace(ge, "'") : e;
 }
-function S(e, t) {
+function b(e, t) {
   const r = () => B(t?.in, NaN), i = Te(e);
   let o;
   if (i.date) {
@@ -720,10 +720,10 @@ function S(e, t) {
   if (!o || isNaN(+o)) return r();
   const a = +o;
   let c = 0, u;
-  if (i.time && (c = ve(i.time), isNaN(c)))
+  if (i.time && (c = Se(i.time), isNaN(c)))
     return r();
   if (i.timezone) {
-    if (u = be(i.timezone), isNaN(u)) return r();
+    if (u = ve(i.timezone), isNaN(u)) return r();
   } else {
     const f = new Date(a + c), d = x(0, t?.in);
     return d.setFullYear(
@@ -775,7 +775,7 @@ function we(e, t) {
   if (!r) return /* @__PURE__ */ new Date(NaN);
   const n = !!r[4], i = D(r[1]), o = D(r[2]) - 1, a = D(r[3]), c = D(r[4]), u = D(r[5]) - 1;
   if (n)
-    return Ce(t, c, u) ? Se(t, c, u) : /* @__PURE__ */ new Date(NaN);
+    return Ce(t, c, u) ? be(t, c, u) : /* @__PURE__ */ new Date(NaN);
   {
     const f = /* @__PURE__ */ new Date(0);
     return !Ee(t, o, a) || !Oe(t, i) ? /* @__PURE__ */ new Date(NaN) : (f.setUTCFullYear(t, o, Math.max(i, a)), f);
@@ -784,7 +784,7 @@ function we(e, t) {
 function D(e) {
   return e ? parseInt(e) : 1;
 }
-function ve(e) {
+function Se(e) {
   const t = e.match(Re);
   if (!t) return NaN;
   const r = E(t[1]), n = E(t[2]), i = E(t[3]);
@@ -793,14 +793,14 @@ function ve(e) {
 function E(e) {
   return e && parseFloat(e.replace(",", ".")) || 0;
 }
-function be(e) {
+function ve(e) {
   if (e === "Z") return 0;
   const t = e.match(xe);
   if (!t) return 0;
   const r = t[1] === "+" ? -1 : 1, n = parseInt(t[2]), i = t[3] && parseInt(t[3]) || 0;
   return _e(n, i) ? r * (n * U + i * k) : NaN;
 }
-function Se(e, t, r) {
+function be(e, t, r) {
   const n = /* @__PURE__ */ new Date(0);
   n.setUTCFullYear(e, 0, 4);
   const i = n.getUTCDay() || 7, o = (t - 1) * 7 + r + 1 - i;
@@ -860,25 +860,25 @@ const Pe = Date.prototype.toJSON, Le = function() {
   minute: "2-digit"
 });
 function ze(e, t) {
-  return e instanceof Date ? e : typeof e == "string" ? S(e) : t;
+  return e instanceof Date ? e : typeof e == "string" ? b(e) : t;
 }
 function Je(e) {
   return ie(e, "yyyy-MM-ddXXX", /* @__PURE__ */ new Date());
 }
 function Ze(e) {
-  const t = S(e);
+  const t = b(e);
   return e = M(t, "EEEE d LLLL yyyy H'h'mm", { locale: C }), e.endsWith(" 0h00") && (e = e.substring(0, e.length - 5)), e;
 }
 function Ke(e, t) {
   return e.getFullYear() === t.getFullYear() && e.getMonth() === t.getMonth() && e.getDate() === t.getDate() ? Ie.format(e) : Ne.format(e);
 }
 function et(e) {
-  const t = e instanceof Date ? e : S(e);
+  const t = e instanceof Date ? e : b(e);
   let r = M(t, "d LLLL yyyy H'h'mm", { locale: C });
   return r.endsWith(" 0h00") && (r = r.substring(0, r.length - 5)), r;
 }
 function tt(e) {
-  const t = e instanceof Date ? e : S(e);
+  const t = e instanceof Date ? e : b(e);
   return M(t, "H'h'mm", { locale: C });
 }
 function nt(e) {
@@ -1055,7 +1055,7 @@ function W(e, t, r) {
   if (!r.has(e.uid)) {
     if (r.add(e.uid), t.documentByUid !== void 0 && e.depotInitialLectureDefinitiveRef !== void 0) {
       const n = t.documentByUid[e.depotInitialLectureDefinitiveRef];
-      n !== void 0 && (e.depotInitialLectureDefinitive = n, v(n, t, r));
+      n !== void 0 && (e.depotInitialLectureDefinitive = n, S(n, t, r));
     }
     if (t.organeByUid !== void 0 && e.organeRef !== void 0) {
       const n = t.organeByUid[e.organeRef];
@@ -1085,16 +1085,16 @@ function W(e, t, r) {
     }
     if (t.documentByUid !== void 0 && e.texteAdopteRef !== void 0) {
       const n = t.documentByUid[e.texteAdopteRef];
-      n !== void 0 && (e.texteAdopte = n, v(n, t, r));
+      n !== void 0 && (e.texteAdopte = n, S(n, t, r));
     }
     if (t.documentByUid !== void 0 && e.texteAssocieRef !== void 0) {
       const n = t.documentByUid[e.texteAssocieRef];
-      n !== void 0 && (e.texteAssocie = n, v(n, t, r));
+      n !== void 0 && (e.texteAssocie = n, S(n, t, r));
     }
     if (t.documentByUid !== void 0 && e.textesAssocies !== void 0)
       for (const n of e.textesAssocies) {
         const i = t.documentByUid[n.texteAssocieRef];
-        i !== void 0 && (n.texteAssocie = i, v(i, t, r));
+        i !== void 0 && (n.texteAssocie = i, S(i, t, r));
       }
     if (t.scrutinByUid !== void 0 && e.voteRefs !== void 0) {
       const n = [];
@@ -1172,7 +1172,7 @@ function H(e, t, r) {
     H(n, t, r);
   return e;
 }
-function v(e, t, r) {
+function S(e, t, r) {
   if (!r.has(e.uid)) {
     r.add(e.uid);
     for (const n of e.auteurs) {
@@ -1405,7 +1405,7 @@ function We(e) {
       return ".asp";
   }
 }
-function* ut(e, t = void 0) {
+function* ut(e, t = void 0, r = !1) {
   if (t === void 0 || t === "raw-html") {
     yield {
       format: "raw-html",
@@ -1416,27 +1416,27 @@ function* ut(e, t = void 0) {
       type: "dyn-docs",
       url: `https://www.assemblee-nationale.fr/dyn/docs/${e.uid}.raw`
     };
-    const r = b(
+    const n = v(
       e,
-      "raw-html"
-      /* RawHtml */
+      "raw-html",
+      r
     );
-    r !== null && (yield {
+    n !== null && (yield {
       format: "raw-html",
-      type: r.directory.replaceAll("/", "-"),
-      url: r.url
+      type: n.directory.replaceAll("/", "-"),
+      url: n.url
     });
   }
   if (t === void 0 || t === "html") {
-    const r = b(
+    const n = v(
       e,
-      "html"
-      /* Html */
+      "html",
+      r
     );
-    r !== null && (yield {
+    n !== null && (yield {
       format: "html",
-      type: r.directory.replaceAll("/", "-"),
-      url: r.url
+      type: n.directory.replaceAll("/", "-"),
+      url: n.url
     });
   }
   if (t === void 0 || t === "pdf") {
@@ -1449,20 +1449,20 @@ function* ut(e, t = void 0) {
       type: "dyn-docs",
       url: `https://www.assemblee-nationale.fr/dyn/docs/${e.uid}.pdf`
     };
-    const r = b(
+    const n = v(
       e,
       "pdf"
       /* Pdf */
     );
-    r !== null && (yield {
+    n !== null && (yield {
       format: "pdf",
-      type: r.directory.replaceAll("/", "-"),
-      url: r.url
+      type: n.directory.replaceAll("/", "-"),
+      url: n.url
     });
   }
 }
 function ct(e, t) {
-  const r = b(e, t);
+  const r = v(e, t);
   return r === null ? null : r.url;
 }
 function ft(e) {
@@ -1474,40 +1474,40 @@ function ft(e) {
   const r = t[2], n = t[3];
   return `http://www2.assemblee-nationale.fr/scrutins/detail/(legislature)/${r}/(num)/${n}`;
 }
-function b(e, t) {
-  const r = We(t), n = /^(.{4})([ANS]*)(R[0-9])([LS]*)([0-9]*)([BTACP]*)(.*)$/.exec(
+function v(e, t, r = !1) {
+  const n = We(t), i = /^(.{4})([ANS]*)(R[0-9])([LS]*)([0-9]*)([BTACP]*)(.*)$/.exec(
     e.uid
   );
-  if (n === null)
-    return console.log(
+  if (i === null)
+    return r && console.log(
       `Unable to generate URL from document or division with unexpected UID: "${e.uid}"`
     ), null;
-  if (n[2] === "SN")
-    return console.log(
+  if (i[2] === "SN")
+    return r && console.log(
       `Unable to generate URL for document or division in Sénat. UID: "${e.uid}"`
     ), null;
-  const o = n[5];
-  let a = n[7];
+  const a = i[5];
+  let c = i[7];
   if (t === "raw-html")
     return {
       directory: "textes",
-      url: `https://www.assemblee-nationale.fr/${o}/textes/${a}${r}`
+      url: `https://www.assemblee-nationale.fr/${a}/textes/${c}${n}`
     };
-  let c = {
+  let u = {
     BTC: "TCOM",
     BTA: "TADO",
     TAP: "TADO"
-  }[n[6]] || n[1];
-  e.classification !== void 0 && e.classification.sousType !== void 0 && e.classification.sousType.code === "COMPA" && (a = a.replace(/-COMPA/, "-aCOMPA")), c == "AVCE" && (c = `AVCE${e.classification.famille?.classe.code}`);
-  const u = $e[c];
-  if (u === void 0)
-    return console.log(
-      `Unable to generate URL from document or division of UID "${e.uid}" and type "${c}"`
+  }[i[6]] || i[1];
+  e.classification !== void 0 && e.classification.sousType !== void 0 && e.classification.sousType.code === "COMPA" && (c = c.replace(/-COMPA/, "-aCOMPA")), u == "AVCE" && (u = `AVCE${e.classification.famille?.classe.code}`);
+  const f = $e[u];
+  if (f === void 0)
+    return r && console.log(
+      `Unable to generate URL from document or division of UID "${e.uid}" and type "${u}"`
     ), null;
-  const f = t === "pdf" ? `pdf/${u.directory}` : u.directory;
+  const d = t === "pdf" ? `pdf/${f.directory}` : f.directory;
   return {
-    directory: f,
-    url: `https://www.assemblee-nationale.fr/${o}/${f}/${u.prefix}${a}${u.suffix}${r}`
+    directory: d,
+    url: `https://www.assemblee-nationale.fr/${a}/${d}/${f.prefix}${c}${f.suffix}${n}`
   };
 }
 export {
@@ -1531,12 +1531,12 @@ export {
   wt as DossierParlementaireXsiType,
   Dn as EtatAmendementCode,
   wn as EtatAmendementLibelle,
-  vt as EtatCycleDeVie,
+  St as EtatCycleDeVie,
   Y as Facet,
-  bt as FamSocPro,
+  vt as FamSocPro,
   Be as FinalStatus,
   q as Follow,
-  St as FormatReunion,
+  bt as FormatReunion,
   At as Legislature,
   Et as LibelleSortScrutin,
   Ot as LibelleTypeVote,
@@ -1556,12 +1556,12 @@ export {
   jt as Regime,
   $t as RegionType,
   Wt as ReunionXsiType,
-  vn as SortAmendement,
+  Sn as SortAmendement,
   Ue as StatusOnly,
   Ht as StatutAdoption,
   Gt as TexteExterneAssocieTypeDoc,
   Qt as TypeActeLegislatif,
-  bn as TypeAuteur,
+  vn as TypeAuteur,
   Xt as TypeBudget,
   Vt as TypeCorrection,
   zt as TypeDocument,
@@ -1569,7 +1569,7 @@ export {
   Zt as TypeJoQuestion,
   Kt as TypeMajorite,
   en as TypeMandat,
-  Sn as TypeMimeNom,
+  bn as TypeMimeNom,
   An as TypeMimeType,
   tn as TypeMission,
   nn as TypeOrgane,
@@ -1597,7 +1597,7 @@ export {
   tt as frenchTimeFromDateOrString,
   h as insertActeurReferences,
   at as insertAmendementReferences,
-  v as insertDocumentReferences,
+  S as insertDocumentReferences,
   G as insertDossierReferences,
   m as insertOrganeReferences,
   qe as insertReunionReferences,

package/lib/loaders.js

@@ -2,7 +2,7 @@ import C from "node:assert";
 import n from "fs-extra";
 import i from "node:path";
 import "node:crypto";
-import { L as r, a1 as U, a2 as M, a3 as q, a4 as Z, a5 as B, a6 as J, Y, $ as G, a0 as K, X as ee, Z as te, _ as se } from "./uids-DaRrTkI-.js";
+import { L as r, a1 as U, a2 as M, a3 as q, a4 as Z, a5 as B, a6 as J, Y, $ as G, a0 as K, X as ee, Z as te, _ as se } from "./uids-CCiVJfZD.js";
 import "glob";
 import { getChangedFilesSinceCommit as k } from "./git.js";
 import { C as N } from "./amendements-40Z7OJLT.js";

package/lib/schemas/debats.json

@@ -113,7 +113,6 @@
         "diffusion",
         "version",
         "environnement",
-        "heureGeneration",
         "sommaire"
       ],
       "additionalProperties": false,

package/lib/scripts/retrieve_documents.d.ts

@@ -7,6 +7,7 @@ type CommonOptions = {
     parseDocuments?: boolean;
     fetchVideos?: boolean;
     onlyRecent?: number;
+    verbose?: boolean;
 };
 export declare function downloadAndParse(document: Document, datasetDir: string, options: any): Promise<void>;
 export declare function downloadAndParseVideosAndCR(reunion: Reunion, datasetCleanDir: string, options: CommonOptions): Promise<void>;

package/lib/scripts/retrieve_videos.d.ts

@@ -2,6 +2,7 @@ import { Reunion } from '../types/agendas';
 type CommonOptions = {
     dataDir?: string;
     legislature: number;
+    verbose?: boolean;
     "only-recent"?: number;
 };
 export declare function downloadAndParseVideos(reunion: Reunion, datasetCleanDir: string, options: CommonOptions): Promise<void>;

package/lib/scripts/shared/cli_helpers.d.ts

@@ -100,3 +100,22 @@ export declare const keepDirOption: {
     name: string;
     type: BooleanConstructor;
 };
+export declare const commonOptions: ({
+    defaultOption: boolean;
+    help: string;
+    name: string;
+    type: StringConstructor;
+} | {
+    help: string;
+    name: string;
+    type: BooleanConstructor;
+} | {
+    help: string;
+    name: string;
+    type: NumberConstructor;
+} | {
+    alias: string;
+    help: string;
+    name: string;
+    type: StringConstructor;
+})[];

package/lib/scripts/shared/utils.d.ts

@@ -1 +1,2 @@
 export declare const writeIfChanged: (p: string, content: string) => Promise<void>;
+export declare function fetchWithRetry(url: string, retries?: number, backoff?: number): Promise<Response>;

package/lib/types/debats.d.ts

@@ -130,7 +130,7 @@ export interface Metadonnees {
     diffusion: string;
     version: string;
     environnement: string;
-    heureGeneration: Date;
+    heureGeneration?: Date;
     sommaire: Sommaire;
 }
 /**

package/lib/{uids-DaRrTkI-.js → uids-CCiVJfZD.js}

@@ -1187,7 +1187,11 @@ const we = {
       { json: "diffusion", js: "diffusion", typ: "" },
       { json: "version", js: "version", typ: "" },
       { json: "environnement", js: "environnement", typ: "" },
-      { json: "heureGeneration", js: "heureGeneration", typ: Date },
+      {
+        json: "heureGeneration",
+        js: "heureGeneration",
+        typ: p(Date, void 0)
+      },
       { json: "sommaire", js: "sommaire", typ: m("Sommaire") }
     ],
     !1

package/lib/urls.d.ts

@@ -5,7 +5,7 @@ export declare enum DocumentUrlFormat {
     Pdf = "pdf",
     RawHtml = "raw-html"
 }
-export declare function iterDocumentOrDivisionUrls(documentOrDivision: Document | Division, format?: DocumentUrlFormat | undefined): Generator<{
+export declare function iterDocumentOrDivisionUrls(documentOrDivision: Document | Division, format?: DocumentUrlFormat | undefined, verbose?: boolean): Generator<{
     format: DocumentUrlFormat;
     type: string;
     url: string;

package/package.json

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