@tricoteuses/senat 2.22.16 → 3.0.0

package/lib/src/model/util.d.ts

@@ -1,9 +1 @@
-import { Expression } from "kysely";
-export declare function concat(...exprs: Expression<number | string | null | undefined>[]): import("kysely").RawBuilder<string>;
-export declare function expandToRows(expr: Expression<string | null | undefined>, regexp: Expression<string>): import("kysely").RawBuilder<unknown>;
-export declare function nullIf(expr: Expression<number | string | null | undefined>): import("kysely").RawBuilder<unknown>;
-export declare function removeSubstring(expr: Expression<string | null | undefined>, pattern: Expression<string>): import("kysely").RawBuilder<string>;
-export declare function replace(expr: Expression<string | null | undefined>, pattern: Expression<string>, replacement: Expression<string>): import("kysely").RawBuilder<string>;
-export declare function rtrim(expr: Expression<string | null | undefined>): import("kysely").RawBuilder<string>;
-export declare function toDateString(expr: Expression<Date | null | undefined>, format?: Expression<string>): import("kysely").RawBuilder<string>;
 export declare function toCRDate(dateISO: string, startTime?: string | null): string;

package/lib/src/model/util.js

@@ -1,26 +1,3 @@
-import { sql } from "kysely";
-import { STANDARD_DATE_FORMAT } from "../scripts/datautil";
-export function concat(...exprs) {
-    return sql.join(exprs, sql `||`).$castTo();
-}
-export function expandToRows(expr, regexp) {
-    return sql `unnest(regexp_matches(${expr}, ${regexp}, 'g'))`;
-}
-export function nullIf(expr) {
-    return sql `nullif(trim(${expr}), '')`;
-}
-export function removeSubstring(expr, pattern) {
-    return replace(expr, pattern, sql.val(""));
-}
-export function replace(expr, pattern, replacement) {
-    return sql `replace(${expr}, ${pattern}, ${replacement})`;
-}
-export function rtrim(expr) {
-    return sql `rtrim(${expr})`;
-}
-export function toDateString(expr, format = sql.val(STANDARD_DATE_FORMAT)) {
-    return sql `to_char(${expr}, ${format})`;
-}
 export function toCRDate(dateISO, startTime) {
     const yyyymmdd = dateISO.replace(/-/g, ""); // "20250716"
     let hh = "00", mm = "00", ss = "00", SSS = "000";

package/lib/src/parsers/texte.js

@@ -152,9 +152,9 @@ export function transformTexte(document) {
         signet_dossier: metaElement?.querySelector("FRBRalias[name='signet-dossier-legislatif-senat']")?.getAttribute("value") || null,
         url_dossier_senat: metaElement?.querySelector("FRBRalias[name='url-senat']")?.getAttribute("value") || null,
         url_dossier_assemblee: metaElement?.querySelector("FRBRalias[name='url-AN']")?.getAttribute("value") || null,
-        type: identificationParts?.["type"] || null,
-        session: sessionYears && sessionYears.length > 0 ? sessionYears[0] : null,
-        numero: identificationParts?.["numTexte"] ? parseInt(identificationParts["numTexte"]) : null,
+        type: identificationParts?.["type"] || "",
+        session: sessionYears && sessionYears.length > 0 ? Number(sessionYears[0]) : undefined,
+        numero: identificationParts?.["numTexte"] ?? null,
         date_presentation: datePresentation ? new Date(datePresentation) : null,
         date_depot: dateDepot ? new Date(dateDepot) : null,
         date_publication_xml: datePublicationXml ? new Date(datePublicationXml) : null,
@@ -197,7 +197,7 @@ export function parseTexte(texteXml) {
         return transformTexte(document);
     }
     catch (error) {
-        console.error(`Could not parse texte with error ${error}`);
+        console.error(`Could not parse texte with error ${error.message}`);
     }
     return null;
 }
@@ -209,7 +209,7 @@ export async function parseTexteFromFile(xmlFilePath) {
         return transformTexte(document);
     }
     catch (error) {
-        console.error(`Could not parse texte with error ${error}`);
+        console.error(`Could not parse texte with error ${error.message}`);
     }
     return null;
 }
@@ -221,7 +221,7 @@ export function parseExposeDesMotifs(exposeDesMotifsHtml) {
         return transformExposeDesMotifs(document);
     }
     catch (error) {
-        console.error(`Could not parse exposé des motifs with error ${error}`);
+        console.error(`Could not parse exposé des motifs with error ${error.message}`);
     }
     return null;
 }
@@ -233,7 +233,7 @@ export async function parseExposeDesMotifsFromFile(htmlFilePath) {
         return transformExposeDesMotifs(document);
     }
     catch (error) {
-        console.error(`Could not parse exposé des motifs with error ${error}`);
+        console.error(`Could not parse exposé des motifs with error ${error.message}`);
     }
     return null;
 }