@tricoteuses/senat 2.5.7 → 2.5.9

package/lib/model/texte.js

@@ -1,5 +1,5 @@
 import { JSDOM } from "jsdom";
-import { AKN_WORKFLOW_IDENTIFICATION_STRUCTURE_REGEXP, AKN_IDENTIFICATION_STRUCTURE_REGEXP, } from "../scripts/datautil";
+import { AKN_IDENTIFICATION_STRUCTURE_REGEXP, AKN_WORKFLOW_IDENTIFICATION_STRUCTURE_REGEXP } from "../scripts/datautil";
 import { DivisionType, } from "../types/texte";
 function buildWorklow(metaElement) {
     const stepElements = metaElement.querySelectorAll("workflow step");
@@ -136,6 +136,7 @@ export function transformTexte(document) {
         ?.getAttribute("value") ?? "";
     const identificationParts = AKN_IDENTIFICATION_STRUCTURE_REGEXP.exec(identification)?.groups;
     const bodyElement = document.querySelector("body");
+    const sessionYears = identificationParts?.["session"]?.split("-") || null;
     const datePresentation = metaElement
         ?.querySelector("FRBRdate[name='#presentation']")
         ?.getAttribute("date");
@@ -160,7 +161,7 @@ export function transformTexte(document) {
             ?.querySelector("FRBRalias[name='url-AN']")
             ?.getAttribute("value") || null,
         type: identificationParts?.["type"] || null,
-        session: identificationParts?.["session"] || null,
+        session: sessionYears && sessionYears.length > 0 ? sessionYears[0] : null,
         numero: identificationParts?.["numTexte"]
             ? parseInt(identificationParts["numTexte"])
             : null,
@@ -194,10 +195,10 @@ export function transformExposeDesMotifs(document) {
                 continue;
             }
             else {
-                sectionElement.removeChild(secondParagraph);
+                secondParagraph.remove();
             }
         }
-        sectionElement.removeChild(firstParagraph);
+        firstParagraph.remove();
         return {
             text: sectionElement.textContent?.trim() ?? null,
             html: sectionElement.innerHTML?.trim() ?? null,
@@ -230,14 +231,26 @@ export async function parseTexteFromFile(xmlFilePath) {
     return null;
 }
 export function parseExposeDesMotifs(exposeDesMotifsHtml) {
-    const { document } = new JSDOM(exposeDesMotifsHtml, {
-        contentType: "text/html",
-    }).window;
-    return transformExposeDesMotifs(document);
+    try {
+        const { document } = new JSDOM(exposeDesMotifsHtml, {
+            contentType: "text/html",
+        }).window;
+        return transformExposeDesMotifs(document);
+    }
+    catch (error) {
+        console.error(`Could not parse exposé des motifs with error ${error}`);
+    }
+    return null;
 }
 // Prevent from memory leak
 // https://github.com/jsdom/jsdom/issues/2583#issuecomment-559520814
 export async function parseExposeDesMotifsFromFile(htmlFilePath) {
-    const { document } = (await JSDOM.fromFile(htmlFilePath, { contentType: "text/html" })).window;
-    return transformExposeDesMotifs(document);
+    try {
+        const { document } = (await JSDOM.fromFile(htmlFilePath, { contentType: "text/html" })).window;
+        return transformExposeDesMotifs(document);
+    }
+    catch (error) {
+        console.error(`Could not parse exposé des motifs with error ${error}`);
+    }
+    return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.5.7",
+  "version": "2.5.9",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",