@tricoteuses/assemblee 1.0.0-next.2 → 1.0.2

package/lib/parsers/recherche_amendements.mjs

@@ -0,0 +1,189 @@
+import assert from "assert"; // Note: "/index.js" added to imports, because of issue
+// https://github.com/date-fns/date-fns/issues/2964
+
+import formatISO from "date-fns/formatISO/index.js";
+import frLocale from "date-fns/locale/fr/index.js";
+import parseDate from "date-fns/parse/index.js";
+import deepEqual from "deep-equal";
+import fs from "fs-extra";
+import frontMatter from "front-matter";
+import jsYaml from "js-yaml";
+import fetch from "node-fetch";
+import { parse as parseHtml } from "node-html-parser";
+import path from "path";
+import { cleanAmendement } from "../cleaners/index.mjs";
+import { Convert as AmendementsConvert } from "../types/amendements.mjs";
+export async function* iterRechercheAmendements(amendementsSearchCacheDir, url, incremental, minDateDepot, minDateExamen, options = {}) {
+  for await (const [amendementUrlPath, amendement] of iterRechercheRawAmendements(amendementsSearchCacheDir, url, incremental, minDateDepot, minDateExamen, options)) {
+    cleanAmendement(amendement); // Double conversion, to convert strings to dates.
+
+    yield [amendementUrlPath, AmendementsConvert.toAmendement(JSON.stringify(amendement))];
+  }
+}
+export async function* iterRechercheRawAmendements(amendementsSearchCacheDir, url, incremental, minDateDepot, minDateExamen, options = {}) {
+  await fs.ensureDir(amendementsSearchCacheDir);
+  assert.strictEqual(/[?&]date_depot=/.exec(url), null, `URL ${url} already contains a deposit date`);
+  assert.strictEqual(/[?&]order=/.exec(url), null, `URL ${url} already contains a sort order`);
+  assert.strictEqual(/[?&]page=/.exec(url), null, `URL ${url} already contains a page number`);
+
+  if (incremental) {
+    assert.notStrictEqual(/[?&]etat=/.exec(url), null, `In incremental mode, URL ${url} must contain an "etat" query parameter`);
+  }
+
+  url += (url.includes("?") ? "&" : "?") + "order=date_depot,desc&page=1";
+
+  if (minDateDepot != null) {
+    assert.notStrictEqual(/\d{4}-\d{2}-\d{2}/.exec(minDateDepot), null, `Invalid format for minimum date: ${minDateDepot}`);
+  }
+
+  let amendementNumber = 0;
+
+  iterSearchPages: while (true) {
+    if (options.verbose) {
+      console.log(`Fetching amendements search page at ${url}…`);
+    }
+
+    const response = await fetch(url);
+    assert(response.ok, `Retrieval of search page at ${url} failed with error: ${response.status} ${response.statusText}`);
+    const page = await response.text();
+    const html = parseHtml(page);
+
+    if (html.querySelector("div.no-result") !== null) {
+      break;
+    }
+
+    const amendementsCountDiv = html.querySelector("div.mirror-card-subtitle");
+    assert.notStrictEqual(amendementsCountDiv, null);
+    const amendementsCount = parseInt(/\d+/.exec(amendementsCountDiv.text)[0]);
+    const amendementsDiv = html.querySelector("div.amendement-list--results-table");
+    assert.notStrictEqual(amendementsDiv, null);
+    const amendementsTable = amendementsDiv.querySelector("table");
+    assert.notStrictEqual(amendementsTable, null);
+    const tfootTr = amendementsTable.querySelector("tfoot > tr");
+    assert.notStrictEqual(tfootTr, null);
+    const tfootTrCells = tfootTr.querySelectorAll("td, th").map(cell => cell.text);
+    assert(deepEqual(tfootTrCells, ["", "n°", "Dossier législatif", "Emplacement", "Auteur", "État", "Sort", "Date d'examen", "Examiné par", "Texte visé", "Date de dépôt"]), `Unexpected columns in ${JSON.stringify(tfootTrCells, null, 2)}`);
+    const amendementsTr = amendementsTable.querySelectorAll("tbody > tr");
+    assert.notStrictEqual(amendementsTr.length, 0);
+
+    for (const amendementTr of amendementsTr) {
+      amendementNumber++;
+
+      if (minDateDepot != null || minDateExamen != null) {
+        const amendementTdList = amendementTr.querySelectorAll("td");
+        assert.strictEqual(amendementTdList.length, 11, `Unexpected number of columns in amendment row: ${amendementTr.outerHTML}`);
+
+        if (minDateDepot != null) {
+          const dateDepotTd = amendementTdList[10];
+          const dateDepot = formatISO(parseDate(dateDepotTd.text, "d MMMM y", new Date(), {
+            locale: frLocale
+          }), {
+            representation: "date"
+          });
+
+          if (dateDepot < minDateDepot) {
+            // Since the amendments are sorted by deposit date, once an amendment
+            // with an old deposit date is encountered, the full search can be stopped.
+            break iterSearchPages;
+          }
+        }
+
+        if (minDateExamen != null) {
+          const dateExamenTd = amendementTdList[7];
+
+          if (dateExamenTd.text) {
+            const dateExamen = formatISO(parseDate(dateExamenTd.text, "d MMMM y", new Date(), {
+              locale: frLocale
+            }), {
+              representation: "date"
+            });
+
+            if (dateExamen < minDateExamen) {
+              // This amendment has been discussed since a few days.
+              // => Ignore it, because it should be in Assemblée open data.
+              continue;
+            }
+          }
+        }
+      }
+
+      const amendementUrlPath = amendementTr.getAttribute("data-href");
+      assert.notStrictEqual(amendementUrlPath, undefined);
+      const amendementUrlPathSplitted = amendementUrlPath.split("/");
+      assert.strictEqual(amendementUrlPathSplitted[0], "", `Unexpected URL path for amendement: ${amendementUrlPath}`);
+      assert.strictEqual(amendementUrlPathSplitted[1], "dyn", `Unexpected URL path for amendement: ${amendementUrlPath}`);
+      const amendementSearchCacheFilePath = path.join(amendementsSearchCacheDir, ...amendementUrlPathSplitted.slice(2)) + ".html";
+      await fs.ensureDir(path.dirname(amendementSearchCacheFilePath));
+      const existingAmendementSearchCache = (await fs.pathExists(amendementSearchCacheFilePath)) ? await fs.readFile(amendementSearchCacheFilePath, "utf8") : null;
+      const amendementTrOuterHtml = amendementTr.outerHTML;
+      const amendementSearchCache = `---\n${jsYaml.dump({
+        position: amendementsCount - amendementNumber,
+        search: url.replace(/&page=[\d]+/, "")
+      }, {
+        sortKeys: true
+      })}---\n\n${amendementTrOuterHtml}`;
+
+      if (amendementSearchCache === existingAmendementSearchCache) {
+        if (incremental) {
+          // The same <tr> is already in cache and in the same position.
+          // Assume that following amendments are not changed and stop looking
+          // for amendments to upsert.
+          break iterSearchPages;
+        }
+
+        continue;
+      }
+
+      if (existingAmendementSearchCache !== null && frontMatter(existingAmendementSearchCache).body === amendementTrOuterHtml) {
+        // The same <tr> is already in cache, but in a different position.
+        // Assume the amendment is unchanged.
+        continue;
+      }
+
+      if (options.verbose) {
+        if (existingAmendementSearchCache === null) {
+          console.log(`Adding amendement search cache: ${amendementSearchCacheFilePath}…`);
+        } else {
+          console.log(`Updating amendement search cache: ${amendementSearchCacheFilePath}…`);
+        }
+      }
+
+      const amendementHtmlUrl = new URL(amendementUrlPath, "https://www.assemblee-nationale.fr/").toString();
+      const amendementHtmlResponse = await fetch(amendementHtmlUrl);
+      assert(amendementHtmlResponse.ok, `Retrieval of amendement HTML page at ${amendementHtmlUrl} failed with error: ${amendementHtmlResponse.status} ${amendementHtmlResponse.statusText}`);
+      const amendementHtmlPage = await amendementHtmlResponse.text();
+      const amendementHtml = parseHtml(amendementHtmlPage);
+      const formatsLi = amendementHtml.querySelectorAll("li.mirror-card-header--options--content--item");
+      assert.notStrictEqual(formatsLi.length, 0);
+      const jsonLi = formatsLi.find(formatLi => {
+        const formatSpan = formatLi.querySelector("a > span");
+        assert.notStrictEqual(formatSpan, null, `No <span> in <a> found in ${formatLi.toString()}`);
+        return formatSpan.text === "Version JSON";
+      });
+      assert.notStrictEqual(jsonLi, undefined, `No JSON version found for amendement at ${amendementHtmlUrl}`);
+      const jsonA = jsonLi.querySelector("a");
+      assert.notStrictEqual(jsonA, null, `No <a> found in ${jsonLi.toString()}`);
+      const amendementJsonUrlPath = jsonA.getAttribute("href");
+      assert.notStrictEqual(amendementJsonUrlPath, undefined, `No URL found for JSON version of amendement: ${jsonLi.toString()}`);
+      const amendementJsonUrl = new URL(amendementJsonUrlPath, "https://www.assemblee-nationale.fr/").toString();
+      const amendementJsonResponse = await fetch(amendementJsonUrl);
+      assert(amendementJsonResponse.ok, `Retrieval of amendement JSON page at ${amendementJsonUrl} failed with error: ${amendementJsonResponse.status} ${amendementJsonResponse.statusText}`);
+      const amendement = await amendementJsonResponse.json();
+      yield [amendementUrlPath, amendement]; // SearchCache must be written at the end to ensure that everything is in a consistent state,
+      // even if script fails abruptly.
+
+      await fs.writeFile(amendementSearchCacheFilePath, amendementSearchCache, "utf8");
+    }
+
+    const paginationA = html.querySelector("div.an-pagination--item > i.an-icons-chevron-right ~ a");
+
+    if (paginationA === null) {
+      break;
+    }
+
+    const urlPath = paginationA.getAttribute("href");
+    assert.notStrictEqual(urlPath, undefined);
+    url = new URL(urlPath, "https://www.assemblee-nationale.fr/").toString();
+  }
+}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["assert","formatISO","frLocale","parseDate","deepEqual","fs","frontMatter","jsYaml","fetch","parse","parseHtml","path","cleanAmendement","Convert","AmendementsConvert","iterRechercheAmendements","amendementsSearchCacheDir","url","incremental","minDateDepot","minDateExamen","options","amendementUrlPath","amendement","iterRechercheRawAmendements","toAmendement","JSON","stringify","ensureDir","strictEqual","exec","notStrictEqual","includes","amendementNumber","iterSearchPages","verbose","console","log","response","ok","status","statusText","page","text","html","querySelector","amendementsCountDiv","amendementsCount","parseInt","amendementsDiv","amendementsTable","tfootTr","tfootTrCells","querySelectorAll","map","cell","amendementsTr","length","amendementTr","amendementTdList","outerHTML","dateDepotTd","dateDepot","Date","locale","representation","dateExamenTd","dateExamen","getAttribute","undefined","amendementUrlPathSplitted","split","amendementSearchCacheFilePath","join","slice","dirname","existingAmendementSearchCache","pathExists","readFile","amendementTrOuterHtml","amendementSearchCache","dump","position","search","replace","sortKeys","body","amendementHtmlUrl","URL","toString","amendementHtmlResponse","amendementHtmlPage","amendementHtml","formatsLi","jsonLi","find","formatLi","formatSpan","jsonA","amendementJsonUrlPath","amendementJsonUrl","amendementJsonResponse","json","writeFile","paginationA","urlPath"],"sources":["../../src/parsers/recherche_amendements.ts"],"sourcesContent":["import assert from \"assert\"\n// Note: \"/index.js\" added to imports, because of issue\n// https://github.com/date-fns/date-fns/issues/2964\nimport formatISO from \"date-fns/formatISO/index.js\"\nimport frLocale from \"date-fns/locale/fr/index.js\"\nimport parseDate from \"date-fns/parse/index.js\"\nimport deepEqual from \"deep-equal\"\nimport fs from \"fs-extra\"\nimport frontMatter from \"front-matter\"\nimport jsYaml from \"js-yaml\"\nimport fetch from \"node-fetch\"\nimport { parse as parseHtml } from \"node-html-parser\"\nimport path from \"path\"\n\nimport { cleanAmendement } from \"../cleaners\"\nimport { Amendement as RawAmendement } from \"../raw_types/amendements\"\nimport { Amendement, Convert as AmendementsConvert } from \"../types/amendements\"\n\nexport async function* iterRechercheAmendements(\n  amendementsSearchCacheDir: string,\n  url: string,\n  incremental: boolean,\n  minDateDepot?: string | null,\n  minDateExamen?: string | null,\n  options: { silent?: boolean; verbose?: boolean } = {},\n): AsyncGenerator<[string, Amendement], void, unknown> {\n  for await (const [\n    amendementUrlPath,\n    amendement,\n  ] of iterRechercheRawAmendements(\n    amendementsSearchCacheDir,\n    url,\n    incremental,\n    minDateDepot,\n    minDateExamen,\n    options,\n  )) {\n    cleanAmendement(amendement)\n    // Double conversion, to convert strings to dates.\n    yield [\n      amendementUrlPath,\n      AmendementsConvert.toAmendement(JSON.stringify(amendement)),\n    ]\n  }\n}\n\nexport async function* iterRechercheRawAmendements(\n  amendementsSearchCacheDir: string,\n  url: string,\n  incremental: boolean,\n  minDateDepot?: string | null,\n  minDateExamen?: string | null,\n  options: { silent?: boolean; verbose?: boolean } = {},\n): AsyncGenerator<[string, RawAmendement], void, unknown> {\n  await fs.ensureDir(amendementsSearchCacheDir)\n\n  assert.strictEqual(\n    /[?&]date_depot=/.exec(url),\n    null,\n    `URL ${url} already contains a deposit date`,\n  )\n  assert.strictEqual(\n    /[?&]order=/.exec(url),\n    null,\n    `URL ${url} already contains a sort order`,\n  )\n  assert.strictEqual(\n    /[?&]page=/.exec(url),\n    null,\n    `URL ${url} already contains a page number`,\n  )\n  if (incremental) {\n    assert.notStrictEqual(\n      /[?&]etat=/.exec(url),\n      null,\n      `In incremental mode, URL ${url} must contain an \"etat\" query parameter`,\n    )\n  }\n  url += (url.includes(\"?\") ? \"&\" : \"?\") + \"order=date_depot,desc&page=1\"\n\n  if (minDateDepot != null) {\n    assert.notStrictEqual(\n      /\\d{4}-\\d{2}-\\d{2}/.exec(minDateDepot),\n      null,\n      `Invalid format for minimum date: ${minDateDepot}`,\n    )\n  }\n\n  let amendementNumber = 0\n  iterSearchPages: while (true) {\n    if (options.verbose) {\n      console.log(`Fetching amendements search page at ${url}…`)\n    }\n    const response = await fetch(url)\n    assert(\n      response.ok,\n      `Retrieval of search page at ${url} failed with error: ${response.status} ${response.statusText}`,\n    )\n    const page = await response.text()\n    const html = parseHtml(page)\n    if (html.querySelector(\"div.no-result\") !== null) {\n      break\n    }\n    const amendementsCountDiv = html.querySelector(\"div.mirror-card-subtitle\")\n    assert.notStrictEqual(amendementsCountDiv, null)\n    const amendementsCount = parseInt(/\\d+/.exec(amendementsCountDiv!.text)![0])\n    const amendementsDiv = html.querySelector(\n      \"div.amendement-list--results-table\",\n    )\n    assert.notStrictEqual(amendementsDiv, null)\n    const amendementsTable = amendementsDiv!.querySelector(\"table\")\n    assert.notStrictEqual(amendementsTable, null)\n    const tfootTr = amendementsTable!.querySelector(\"tfoot > tr\")\n    assert.notStrictEqual(tfootTr, null)\n    const tfootTrCells = tfootTr!\n      .querySelectorAll(\"td, th\")\n      .map((cell) => cell.text)\n    assert(\n      deepEqual(tfootTrCells, [\n        \"\",\n        \"n°\",\n        \"Dossier législatif\",\n        \"Emplacement\",\n        \"Auteur\",\n        \"État\",\n        \"Sort\",\n        \"Date d'examen\",\n        \"Examiné par\",\n        \"Texte visé\",\n        \"Date de dépôt\",\n      ]),\n      `Unexpected columns in ${JSON.stringify(tfootTrCells, null, 2)}`,\n    )\n    const amendementsTr = amendementsTable!.querySelectorAll(\"tbody > tr\")\n    assert.notStrictEqual(amendementsTr.length, 0)\n    for (const amendementTr of amendementsTr) {\n      amendementNumber++\n\n      if (minDateDepot != null || minDateExamen != null) {\n        const amendementTdList = amendementTr.querySelectorAll(\"td\")\n        assert.strictEqual(\n          amendementTdList.length,\n          11,\n          `Unexpected number of columns in amendment row: ${amendementTr.outerHTML}`,\n        )\n        if (minDateDepot != null) {\n          const dateDepotTd = amendementTdList[10]\n          const dateDepot = formatISO(\n            parseDate(dateDepotTd.text, \"d MMMM y\", new Date(), { locale: frLocale }),\n            { representation: \"date\" },\n          )\n          if (dateDepot < minDateDepot) {\n            // Since the amendments are sorted by deposit date, once an amendment\n            // with an old deposit date is encountered, the full search can be stopped.\n            break iterSearchPages\n          }\n        }\n        if (minDateExamen != null) {\n          const dateExamenTd = amendementTdList[7]\n          if (dateExamenTd.text) {\n            const dateExamen = formatISO(\n              parseDate(dateExamenTd.text, \"d MMMM y\", new Date(), {\n                locale: frLocale,\n              }),\n              { representation: \"date\" },\n            )\n            if (dateExamen < minDateExamen) {\n              // This amendment has been discussed since a few days.\n              // => Ignore it, because it should be in Assemblée open data.\n              continue\n            }\n          }\n        }\n      }\n\n      const amendementUrlPath = amendementTr.getAttribute(\"data-href\")\n      assert.notStrictEqual(amendementUrlPath, undefined)\n      const amendementUrlPathSplitted = amendementUrlPath!.split(\"/\")\n      assert.strictEqual(\n        amendementUrlPathSplitted[0],\n        \"\",\n        `Unexpected URL path for amendement: ${amendementUrlPath}`,\n      )\n      assert.strictEqual(\n        amendementUrlPathSplitted[1],\n        \"dyn\",\n        `Unexpected URL path for amendement: ${amendementUrlPath}`,\n      )\n      const amendementSearchCacheFilePath =\n        path.join(\n          amendementsSearchCacheDir,\n          ...amendementUrlPathSplitted.slice(2),\n        ) + \".html\"\n      await fs.ensureDir(path.dirname(amendementSearchCacheFilePath))\n      const existingAmendementSearchCache = (await fs.pathExists(\n        amendementSearchCacheFilePath,\n      ))\n        ? await fs.readFile(amendementSearchCacheFilePath, \"utf8\")\n        : null\n      const amendementTrOuterHtml = amendementTr.outerHTML\n      const amendementSearchCache = `---\\n${jsYaml.dump(\n        {\n          position: amendementsCount - amendementNumber,\n          search: url.replace(/&page=[\\d]+/, \"\"),\n        },\n        {\n          sortKeys: true,\n        },\n      )}---\\n\\n${amendementTrOuterHtml}`\n      if (amendementSearchCache === existingAmendementSearchCache) {\n        if (incremental) {\n          // The same <tr> is already in cache and in the same position.\n          // Assume that following amendments are not changed and stop looking\n          // for amendments to upsert.\n          break iterSearchPages\n        }\n        continue\n      }\n      if (\n        existingAmendementSearchCache !== null &&\n        frontMatter(existingAmendementSearchCache).body ===\n          amendementTrOuterHtml\n      ) {\n        // The same <tr> is already in cache, but in a different position.\n        // Assume the amendment is unchanged.\n        continue\n      }\n      if (options.verbose) {\n        if (existingAmendementSearchCache === null) {\n          console.log(\n            `Adding amendement search cache: ${amendementSearchCacheFilePath}…`,\n          )\n        } else {\n          console.log(\n            `Updating amendement search cache: ${amendementSearchCacheFilePath}…`,\n          )\n        }\n      }\n      const amendementHtmlUrl = new URL(\n        amendementUrlPath!,\n        \"https://www.assemblee-nationale.fr/\",\n      ).toString()\n      const amendementHtmlResponse = await fetch(amendementHtmlUrl)\n      assert(\n        amendementHtmlResponse.ok,\n        `Retrieval of amendement HTML page at ${amendementHtmlUrl} failed with error: ${amendementHtmlResponse.status} ${amendementHtmlResponse.statusText}`,\n      )\n      const amendementHtmlPage = await amendementHtmlResponse.text()\n      const amendementHtml = parseHtml(amendementHtmlPage)\n      const formatsLi = amendementHtml.querySelectorAll(\n        \"li.mirror-card-header--options--content--item\",\n      )\n      assert.notStrictEqual(formatsLi.length, 0)\n      const jsonLi = formatsLi.find((formatLi) => {\n        const formatSpan = formatLi.querySelector(\"a > span\")\n        assert.notStrictEqual(\n          formatSpan,\n          null,\n          `No <span> in <a> found in ${formatLi.toString()}`,\n        )\n        return formatSpan!.text === \"Version JSON\"\n      })\n      assert.notStrictEqual(\n        jsonLi,\n        undefined,\n        `No JSON version found for amendement at ${amendementHtmlUrl}`,\n      )\n      const jsonA = jsonLi!.querySelector(\"a\")\n      assert.notStrictEqual(\n        jsonA,\n        null,\n        `No <a> found in ${jsonLi!.toString()}`,\n      )\n      const amendementJsonUrlPath = jsonA!.getAttribute(\"href\")\n      assert.notStrictEqual(\n        amendementJsonUrlPath,\n        undefined,\n        `No URL found for JSON version of amendement: ${jsonLi!.toString()}`,\n      )\n      const amendementJsonUrl = new URL(\n        amendementJsonUrlPath!,\n        \"https://www.assemblee-nationale.fr/\",\n      ).toString()\n      const amendementJsonResponse = await fetch(amendementJsonUrl)\n      assert(\n        amendementJsonResponse.ok,\n        `Retrieval of amendement JSON page at ${amendementJsonUrl} failed with error: ${amendementJsonResponse.status} ${amendementJsonResponse.statusText}`,\n      )\n      const amendement = await amendementJsonResponse.json()\n      yield [amendementUrlPath!, amendement]\n\n      // SearchCache must be written at the end to ensure that everything is in a consistent state,\n      // even if script fails abruptly.\n      await fs.writeFile(\n        amendementSearchCacheFilePath,\n        amendementSearchCache,\n        \"utf8\",\n      )\n    }\n\n    const paginationA = html.querySelector(\n      \"div.an-pagination--item > i.an-icons-chevron-right ~ a\",\n    )\n    if (paginationA === null) {\n      break\n    }\n    const urlPath = paginationA.getAttribute(\"href\")\n    assert.notStrictEqual(urlPath, undefined)\n    url = new URL(urlPath!, \"https://www.assemblee-nationale.fr/\").toString()\n  }\n}\n"],"mappings":"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"}

package/lib/raw_types/acteurs_et_organes.d.ts

@@ -3,12 +3,12 @@ export interface Acteur {
 }
 export interface ActeurActeur {
     "@xmlns"?: string;
-    uid: PurpleUid;
-    etatCivil: PurpleEtatCivil;
+    uid: Uid;
+    etatCivil: EtatCivil;
     profession: Profession;
-    uri_hatvp: UriHatvpClass | null | string;
+    uri_hatvp: Nil | null | string;
     adresses: Adresses | null;
-    mandats?: PurpleMandats;
+    mandats?: Mandats;
     "@xmlns:xsi"?: string;
 }
 export interface Adresses {
@@ -20,31 +20,31 @@ export interface Adresses {
     "@xmlns:xsi"?: string;
     "@xsi:nil"?: string;
 }
-export interface PurpleEtatCivil {
-    ident: PurpleIdent;
-    infoNaissance: PurpleInfoNaissance;
-    dateDeces: UriHatvpClass | Date | null;
+export interface EtatCivil {
+    ident: Ident;
+    infoNaissance: InfoNaissance;
+    dateDeces: Nil | Date | null;
 }
-export interface UriHatvpClass {
+export interface Nil {
     "@xmlns:xsi": string;
     "@xsi:nil": string;
 }
-export interface PurpleIdent {
+export interface Ident {
     civ: Civ;
     prenom: string;
     nom: string;
     alpha: string;
-    trigramme: UriHatvpClass | null | string;
+    trigramme: Nil | null | string;
 }
 export declare enum Civ {
     M = "M.",
     Mme = "Mme"
 }
-export interface PurpleInfoNaissance {
-    dateNais: UriHatvpClass | Date | null;
-    villeNais: UriHatvpClass | null | string;
-    depNais: UriHatvpClass | DepNais | null;
-    paysNais: UriHatvpClass | null | string;
+export interface InfoNaissance {
+    dateNais: Nil | Date | null;
+    villeNais: Nil | null | string;
+    depNais: Nil | DepNais | null;
+    paysNais: Nil | null | string;
 }
 export declare enum DepNais {
     Ain = "Ain",
@@ -160,12 +160,12 @@ export declare enum DepNais {
     Yonne = "Yonne",
     Yvelines = "Yvelines"
 }
-export interface PurpleMandats {
-    mandat: PurpleMandat[] | FluffyMandat;
+export interface Mandats {
+    mandat: Mandat[] | Mandat;
 }
-export interface PurpleMandat {
+export interface Mandat {
     "@xmlns:xsi"?: string;
-    "@xsi:type": MandatXsiType;
+    "@xsi:type"?: MandatXsiType;
     uid: string;
     acteurRef: string;
     legislature: null | string;
@@ -176,13 +176,14 @@ export interface PurpleMandat {
     preseance: null | string;
     nominPrincipale: string;
     infosQualite: InfosQualite;
-    organes: PurpleOrganes;
+    organes: Organes;
     libelle?: null | string;
     missionSuivanteRef?: null | string;
     missionPrecedenteRef?: null | string;
     suppleants?: Suppleants | null;
     chambre?: null;
-    election?: PurpleElection;
+    election?: Election;
+    InfosHorsSIAN?: InfosHorsSian;
     mandature?: Mandature;
     collaborateurs?: null[] | Collaborateurs | null;
 }
@@ -202,7 +203,7 @@ export interface CollaborateurElement {
     dateDebut: null;
     dateFin: null;
 }
-export interface PurpleElection {
+export interface Election {
     lieu: ElectionLieu;
     causeMandat: null | string;
     refCirconscription?: null | string;
@@ -259,7 +260,7 @@ export interface Mandature {
     mandatRemplaceRef?: null | string;
     matriculeVote?: null | string;
 }
-export interface PurpleOrganes {
+export interface Organes {
     organeRef: string[] | string;
 }
 export interface Suppleants {
@@ -305,36 +306,13 @@ export declare enum CodeType {
     Presrep = "PRESREP",
     Senat = "SENAT"
 }
-export interface FluffyMandat {
-    "@xmlns:xsi": string;
-    "@xsi:type": MandatXsiType;
-    uid: string;
-    acteurRef: string;
-    legislature: null | string;
-    typeOrgane: CodeType;
-    dateDebut: Date;
-    datePublication: null;
-    dateFin: Date | null;
-    preseance: null | string;
-    nominPrincipale: string;
-    infosQualite: InfosQualite;
-    organes: FluffyOrganes;
-    suppleants: null;
-    chambre: null;
-    election: PurpleElection;
-    mandature: Mandature;
-    collaborateurs?: null[] | Collaborateurs | null;
-}
-export interface FluffyOrganes {
-    organeRef: string;
-}
 export interface Profession {
-    libelleCourant: UriHatvpClass | null | string;
+    libelleCourant: Nil | null | string;
     socProcINSEE: SocProcInsee;
 }
 export interface SocProcInsee {
-    catSocPro: UriHatvpClass | null | string;
-    famSocPro: UriHatvpClass | FamSocProEnum | null;
+    catSocPro: Nil | null | string;
+    famSocPro: Nil | FamSocProEnum | null;
 }
 export declare enum FamSocProEnum {
     AgriculteursExploitants = "Agriculteurs exploitants",
@@ -347,7 +325,7 @@ export declare enum FamSocProEnum {
     Retraités = "Retrait\u00E9s",
     SansProfessionDéclarée = "Sans profession d\u00E9clar\u00E9e"
 }
-export interface PurpleUid {
+export interface Uid {
     "@xmlns:xsi"?: string;
     "@xsi:type": UidXsiType;
     "#text": string;
@@ -491,30 +469,8 @@ export interface ViMoDe {
     dateAgrement: Date | null;
     dateFin: Date | null;
 }
-export interface Mandat {
-    mandat: TentacledMandat;
-}
-export interface TentacledMandat {
-    "@xmlns:xsi"?: string;
-    uid: string;
-    acteurRef: string;
-    legislature: null | string;
-    typeOrgane: CodeType;
-    dateDebut: Date;
-    datePublication: Date | null;
-    dateFin: Date | null;
-    preseance: null | string;
-    nominPrincipale: string;
-    infosQualite: InfosQualite;
-    organes: PurpleOrganes;
-    suppleants?: Suppleants | null;
-    chambre?: null;
-    election?: PurpleElection;
-    mandature?: Mandature;
-    collaborateurs?: null[] | Collaborateurs | null;
-    libelle?: null | string;
-    missionSuivanteRef?: null | string;
-    missionPrecedenteRef?: null | string;
+export interface MandatWrapper {
+    mandat: Mandat;
 }
 export interface ActeursEtOrganes {
     export: Export;
@@ -528,82 +484,14 @@ export interface Acteurs {
     acteur: ActeurElement[];
 }
 export interface ActeurElement {
-    uid: FluffyUid;
-    etatCivil: FluffyEtatCivil;
+    uid: Uid;
+    etatCivil: EtatCivil;
     uri_hatvp?: null | string;
-    mandats: FluffyMandats;
-}
-export interface FluffyEtatCivil {
-    ident: FluffyIdent;
-    infoNaissance: FluffyInfoNaissance;
-    dateDeces: Date | null;
-}
-export interface FluffyIdent {
-    civ: Civ;
-    prenom: string;
-    nom: string;
-    alpha: string;
-    trigramme: null | string;
-}
-export interface FluffyInfoNaissance {
-    dateNais: Date;
-    villeNais: null | string;
-    depNais: DepNais | null;
-    paysNais: null | string;
-}
-export interface FluffyMandats {
-    mandat: StickyMandat[] | IndigoMandat;
-}
-export interface StickyMandat {
-    "@xsi:type": MandatXsiType;
-    uid: string;
-    acteurRef: string;
-    legislature: null | string;
-    typeOrgane: CodeType;
-    dateDebut: Date;
-    datePublication: Date | null;
-    dateFin: Date | null;
-    preseance: null | string;
-    nominPrincipale: string;
-    infosQualite: InfosQualite;
-    organes: PurpleOrganes;
-    suppleants?: Suppleants | null;
-    election?: PurpleElection;
-    InfosHorsSIAN?: InfosHorsSian;
-    mandature?: Mandature;
-    libelle?: null | string;
-    missionPrecedenteRef?: null | string;
-    missionSuivanteRef?: null | string;
+    mandats: Mandats;
 }
 export interface InfosHorsSian {
     HATVP_URI: null;
 }
-export interface IndigoMandat {
-    "@xsi:type": MandatXsiType;
-    uid: string;
-    acteurRef: string;
-    legislature: null;
-    typeOrgane: CodeType;
-    dateDebut: Date;
-    datePublication: null;
-    dateFin: Date;
-    preseance: null | string;
-    nominPrincipale: string;
-    infosQualite: InfosQualite;
-    organes: FluffyOrganes;
-    suppleants: null;
-    election: FluffyElection;
-    InfosHorsSIAN: InfosHorsSian;
-    mandature: Mandature;
-}
-export interface FluffyElection {
-    lieu: ElectionLieu;
-    causeMandat: null;
-}
-export interface FluffyUid {
-    "@xsi:type": UidXsiType;
-    "#text": string;
-}
 export interface ExportOrganes {
     organe: OrganeElement[];
 }
@@ -629,8 +517,8 @@ export declare class Convert {
     static deportToJson(value: Deport): string;
     static toOrgane(json: string): Organe;
     static organeToJson(value: Organe): string;
-    static toMandat(json: string): Mandat;
-    static mandatToJson(value: Mandat): string;
+    static toMandatWrapper(json: string): MandatWrapper;
+    static mandatWrapperToJson(value: MandatWrapper): string;
     static toActeursEtOrganes(json: string): ActeursEtOrganes;
     static acteursEtOrganesToJson(value: ActeursEtOrganes): string;
 }