@tricoteuses/senat 2.20.15 → 2.20.17

package/lib/index.d.ts

@@ -3,7 +3,7 @@ export type { DossierLegislatifResult } from "./model/dosleg";
 export type { ScrutinResult } from "./model/scrutins";
 export type { QuestionResult } from "./model/questions";
 export type { CirconscriptionResult, OrganismeResult, SenateurResult } from "./model/sens";
-export type { AgendaEvent, GroupedReunion } from "./types/agenda";
+export type { AgendaEvent, GroupedReunion, GroupedReunionOdjPoint } from "./types/agenda";
 export type { Ses, Sub, TxtAmeli } from "./types/ameli";
 export type { CompteRendu } from "./types/compte_rendu";
 export type { Debat, LecAssDeb } from "./types/debats";

package/lib/utils/nvs-timecode.js

@@ -3,40 +3,6 @@ const xmlParser = new XMLParser({
     ignoreAttributes: false,
     attributeNamePrefix: "@_",
 });
-function getFirstInterventionChapterId(dataNvs) {
-    const xml = xmlParser.parse(dataNvs);
-    const rootChapters = xml?.data?.chapters?.chapter;
-    if (!rootChapters)
-        return null;
-    const chaptersArray = Array.isArray(rootChapters) ? rootChapters : [rootChapters];
-    let foundId = null;
-    function dfsChapter(chapter) {
-        if (foundId)
-            return;
-        const metas = chapter.metadata ? (Array.isArray(chapter.metadata) ? chapter.metadata : [chapter.metadata]) : [];
-        const isIntervention = metas.some((m) => m?.["@_name"] === "type" && (m?.["@_value"] === "IN" || m?.["@_label"] === "Intervention"));
-        const hasSpeaker = !!chapter.speaker;
-        if (isIntervention && hasSpeaker && chapter["@_id"]) {
-            foundId = String(chapter["@_id"]);
-            return;
-        }
-        const children = chapter.chapter;
-        if (!children)
-            return;
-        const childArray = Array.isArray(children) ? children : [children];
-        for (const child of childArray) {
-            dfsChapter(child);
-            if (foundId)
-                return;
-        }
-    }
-    for (const ch of chaptersArray) {
-        dfsChapter(ch);
-        if (foundId)
-            break;
-    }
-    return foundId;
-}
 function getTimecodeForChapterId(finalPlayerNvs, chapterId) {
     const xml = xmlParser.parse(finalPlayerNvs);
     const synchros = xml?.player?.synchro;
@@ -55,8 +21,19 @@ function getTimecodeForChapterId(finalPlayerNvs, chapterId) {
     return Math.floor(ms / 1000);
 }
 export function getFirstInterventionStartTimecode(dataNvs, finalPlayerNvs) {
-    const firstChapterId = getFirstInterventionChapterId(dataNvs);
+    const firstChapterId = getFirstChapterId(dataNvs);
     if (!firstChapterId)
         return null;
     return getTimecodeForChapterId(finalPlayerNvs, firstChapterId);
 }
+function getFirstChapterId(dataNvs) {
+    const xml = xmlParser.parse(dataNvs);
+    const rootChapters = xml?.data?.chapters?.chapter;
+    if (!rootChapters)
+        return null;
+    const chaptersArray = Array.isArray(rootChapters) ? rootChapters : [rootChapters];
+    const firstChapter = chaptersArray[0];
+    if (!firstChapter || !firstChapter["@_id"])
+        return null;
+    return String(firstChapter["@_id"]);
+}

package/package.json

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