@tricoteuses/senat 2.22.16 → 3.0.0

package/lib/src/types/dosleg.d.ts

@@ -1,70 +1,70 @@
-import { txt_ameliFields } from "../raw_types_schemats/ameli";
-import { ass as Ass, aud, audFields, auteur, date_seance, date_seanceFields as dateSeanceFields, deccoc as DecCoc, denrap as DenRap, docatt, docattFields, ecr, ecrFields, etaloi as EtaLoi, lecass, lecassFields, lecassrap, lecture, lectureFields, loi, org as Org, oritxt as OriTxt, qua as Qua, rap, raporg as RapOrg, raporgFields, scr as Scr, texte, texteFields, typatt as TypAtt, typlec as TypLec, typloi as TypLoi, typtxt as TypTxt, typurl as TypUrl, typurlFields } from "../raw_types_schemats/dosleg";
-import { Debat } from "./debats";
-import { TxtAmeli } from "./ameli";
-export type { Ass, DecCoc, DenRap, EtaLoi, Org, OriTxt, Qua, RapOrg, Scr, TypAtt, TypLec, TypLoi, TypTxt, TypUrl };
-export interface Aud extends aud {
+import { Ass, Aud as AudRaw, Auteur as AuteurRaw, DateSeance as DateSeanceRaw, Deccoc, Denrap, Docatt as DocattRaw, Ecr as EcrRaw, Etaloi, Lecass as LecassRaw, Lecassrap as LecassrapRaw, Lecture as LectureRaw, Loi as LoiRaw, Org, Oritxt, Qua, Rap as RapRaw, Raporg, Scr, Texte as TexteRaw, Typatt, Typlec, Typloi, Typtxt, Typurl } from "../raw_types/dosleg";
+import { TxtAmeli } from "../raw_types/ameli";
+import { Debats } from "../raw_types/debats";
+import { TxtAmeliCustom } from "./ameli";
+export type { Deccoc as DecCoc, Denrap as DenRap, Etaloi as EtaLoi, Oritxt as OriTxt, Raporg as RapOrg, Typatt as TypAtt, Typlec as TypLec, Typloi as TypLoi, Typtxt as TypTxt, Typurl as TypUrl, };
+export interface Aud extends AudRaw {
     org?: Org;
 }
-export interface Auteur extends auteur {
+export interface Auteur extends AuteurRaw {
     qua?: Qua;
 }
-export interface DateSeance extends date_seance {
-    debat?: Debat;
+export interface DateSeance extends DateSeanceRaw {
+    debat?: Debats;
     scrids?: string[];
     scrs?: Scr[];
 }
-export interface DocAtt extends docatt {
-    rap?: Rap;
-    typatt?: TypAtt;
+export interface DocAtt extends DocattRaw {
+    rap?: RapRaw;
+    typatt?: Typatt;
 }
-export interface Ecr extends ecr {
+export interface Ecr extends EcrRaw {
     aut?: Auteur;
 }
-export interface LecAss extends lecass {
+export interface LecAss extends LecassRaw {
     ass?: Ass;
     auds?: Aud[];
-    audcles?: audFields.audcle[];
+    audcles?: AudRaw["audcle"][];
     datesSeances?: DateSeance[];
-    datesSeancesCodes?: dateSeanceFields.code[];
+    datesSeancesCodes?: DateSeanceRaw["code"][];
     debatdatseas: Date[];
     lecassraps?: LecAssRap[];
     lecassrapids?: string[];
     org?: Org;
-    texcods: texteFields.texcod[];
+    texcods: TexteRaw["texcod"][];
     textes?: Texte[];
 }
-export interface LecAssRap extends lecassrap {
-    rap?: Rap;
+export interface LecAssRap extends LecassrapRaw {
+    rap?: RapRaw;
 }
-export interface Lecture extends lecture {
-    typlec?: TypLec;
-    lecassidts?: lecassFields.lecassidt[];
+export interface Lecture extends LectureRaw {
+    typlec?: Typlec;
+    lecassidts?: LecassRaw["lecassidt"][];
     lecasss?: LecAss[];
 }
-export interface Loi extends loi {
-    deccoc?: DecCoc;
-    etaloi?: EtaLoi;
-    lecidts?: lectureFields.lecidt[];
+export interface Loi extends LoiRaw {
+    deccoc?: Deccoc;
+    etaloi?: Etaloi;
+    lecidts?: LectureRaw["lecidt"][];
     lectures?: Lecture[];
-    typloi?: TypLoi;
+    typloi?: Typloi;
 }
-export interface Rap extends rap {
-    denrap?: DenRap;
-    docattcles?: docattFields.docattcle[];
+export interface Rap extends RapRaw {
+    denrap?: Denrap;
+    docattcles?: DocattRaw["docattcle"][];
     docatts?: DocAtt[];
-    ecrnums?: ecrFields.ecrnum[];
+    ecrnums?: EcrRaw["ecrnum"][];
     ecrs?: Ecr[];
-    orgcods?: raporgFields.orgcod[];
+    orgcods?: Raporg["orgcod"][];
     orgs?: Org[];
 }
-export interface Texte extends texte {
+export interface Texte extends TexteRaw {
     ecrs?: Ecr[];
-    ecrnums?: ecrFields.ecrnum[];
-    libtypurl?: typurlFields.libtypurl;
+    ecrnums?: EcrRaw["ecrnum"][];
+    libtypurl?: Typurl["libtypurl"];
     org?: Org;
-    oritxt: OriTxt;
-    typtxt?: TypTxt;
-    txtAmeli?: TxtAmeli;
-    txtAmeliId: txt_ameliFields.id;
+    oritxt: Oritxt;
+    typtxt?: Typtxt;
+    txtAmeli?: TxtAmeliCustom;
+    txtAmeliId: TxtAmeli["id"];
 }

package/lib/src/types/questions.d.ts

@@ -1,2 +1,2 @@
-import { tam_questions as Question } from "../raw_types_schemats/questions";
-export type { Question };
+import { TamQuestions } from "../raw_types/questions";
+export type { TamQuestions as Question };

package/lib/src/types/sens.d.ts

@@ -1,5 +1,3 @@
-import { sen as Sen } from "../raw_types_schemats/sens";
-export type { Sen };
 export interface Photo {
     chemin: string;
     cheminMosaique: string;

package/lib/src/types/texte.d.ts

@@ -23,7 +23,7 @@ export interface DocumentMetadata {
     url_html: URL;
     url_pdf: URL;
 }
-export interface FlatTexte extends DocumentResult {
+export interface FlatTexte extends Partial<DocumentResult> {
     titre: string | null;
     titre_court: string | null;
     url_dossier_senat: string | null;

package/lib/src/utils/cr_spliting.d.ts

@@ -1,16 +1,18 @@
 import { Reunion } from "../types/agenda";
-export declare function parseCommissionMetadataFromHtml(html: string, sourceFileName?: string): {
+type MetadataDay = {
+    date: string;
+    openTime?: string;
+    h2Index: number;
+};
+type CommissionMetadata = {
     sourceFile: string | null;
     organeTitleRaw: string | null;
     organeDetected: string | null;
     organeCode: string | null;
     weekStart: string | null;
-    days: {
-        date: string;
-        openTime?: string;
-        h2Index: number;
-    }[];
+    days: MetadataDay[];
 };
+export declare function parseCommissionMetadataFromHtml(html: string, sourceFileName?: string): CommissionMetadata;
 export declare function loadAgendaForDate(dataDir: string, yyyymmdd: string, session: number): Promise<Reunion[]>;
 export declare function linkCRtoCommissionGroup(opts: {
     dataDir: string;
@@ -26,3 +28,4 @@ export declare function linkCRtoCommissionGroup(opts: {
     created: boolean;
     updated: boolean;
 }>;
+export {};

package/lib/src/utils/cr_spliting.js

@@ -5,106 +5,6 @@ import fs from "fs-extra";
 import { sessionStartYearFromDate } from "../model/seance";
 import { frDateToISO, hourShortToStartTime } from "./date";
 import { normalizeSpaces } from "./string_cleaning";
-// Convert "quinze heures trente", "15 heures 30", "dix-sept heures moins le quart", etc. en "HHMM"
-function parseFrenchClockToHHMM(input) {
-    const s = (input || "")
-        .toLowerCase()
-        .normalize("NFKD")
-        .replace(/[\u0300-\u036f]/g, "")
-        .trim();
-    if (!s)
-        return undefined;
-    const digitMatch = s.match(/(\d{1,2})\s*heures?(?:\s*(\d{1,2}))?/);
-    if (digitMatch) {
-        const h = Math.min(24, Math.max(0, parseInt(digitMatch[1], 10)));
-        const m = digitMatch[2] ? Math.min(59, Math.max(0, parseInt(digitMatch[2], 10))) : 0;
-        return `${String(h).padStart(2, "0")}${String(m).padStart(2, "0")}`;
-    }
-    const NUM = new Map([
-        ["zero", 0],
-        ["une", 1],
-        ["un", 1],
-        ["deux", 2],
-        ["trois", 3],
-        ["quatre", 4],
-        ["cinq", 5],
-        ["six", 6],
-        ["sept", 7],
-        ["huit", 8],
-        ["neuf", 9],
-        ["dix", 10],
-        ["onze", 11],
-        ["douze", 12],
-        ["treize", 13],
-        ["quatorze", 14],
-        ["quinze", 15],
-        ["seize", 16],
-        ["dix-sept", 17],
-        ["dix sept", 17],
-        ["dix-huit", 18],
-        ["dix huit", 18],
-        ["dix-neuf", 19],
-        ["dix neuf", 19],
-        ["vingt", 20],
-        ["vingt et une", 21],
-        ["vingt-et-une", 21],
-        ["vingt et un", 21],
-        ["vingt-et-un", 21],
-        ["vingt-deux", 22],
-        ["vingt deux", 22],
-        ["vingt-trois", 23],
-        ["vingt trois", 23],
-        ["vingt-quatre", 24],
-        ["vingt quatre", 24],
-    ]);
-    const hourWordMatch = s.match(/([a-z\- ]+?)\s*heures?/);
-    if (!hourWordMatch)
-        return undefined;
-    const hourWord = hourWordMatch[1].trim();
-    let hour = NUM.get(hourWord);
-    if (hour == null) {
-        const cleaned = hourWord.replace(/\s+/g, " ");
-        hour = NUM.get(cleaned);
-    }
-    if (hour == null)
-        return undefined;
-    let minutes = 0;
-    if (/\bet (demie|demi)\b/.test(s))
-        minutes = 30;
-    else if (/\bet quart\b/.test(s))
-        minutes = 15;
-    else if (/\bmoins le quart\b/.test(s)) {
-        hour = (hour + 23) % 24;
-        minutes = 45;
-    }
-    else {
-        const MIN = new Map([
-            ["cinq", 5],
-            ["dix", 10],
-            ["quinze", 15],
-            ["vingt", 20],
-            ["vingt-cinq", 25],
-            ["vingt cinq", 25],
-            ["trente", 30],
-            ["trente-cinq", 35],
-            ["trente cinq", 35],
-            ["quarante", 40],
-            ["quarante-cinq", 45],
-            ["quarante cinq", 45],
-            ["cinquante", 50],
-            ["cinquante-cinq", 55],
-            ["cinquante cinq", 55],
-        ]);
-        const minWordMatch = s.match(/heures?\s+([a-z\- ]+?)(?:[).,;]|$)/);
-        if (minWordMatch) {
-            const mw = minWordMatch[1].trim();
-            const m1 = MIN.get(mw);
-            if (m1 != null)
-                minutes = m1;
-        }
-    }
-    return `${String(hour).padStart(2, "0")}${String(minutes).padStart(2, "0")}`;
-}
 function extractWeekStartFromHead($) {
     const og = $('meta[property="og:title"]').attr("content") || $("title").text();
     const m = (og ?? "").toLowerCase().match(/semaine du\s+(\d{1,2}\s+\w+\s+\d{4})/i);
@@ -181,7 +81,12 @@ export function parseCommissionMetadataFromHtml(html, sourceFileName) {
     };
 }
 function isGroupedReunion(o) {
-    return o && typeof o === "object" && typeof o.uid === "string" && typeof o.date === "string";
+    return (typeof o === "object" &&
+        o !== null &&
+        "uid" in o &&
+        typeof o.uid === "string" &&
+        "date" in o &&
+        typeof o.date === "string");
 }
 export async function loadAgendaForDate(dataDir, yyyymmdd, session) {
     const baseDir = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session));

package/lib/src/utils/reunion_odj_building.d.ts

@@ -1,5 +1,9 @@
 import commandLineArgs from "command-line-args";
-import { DossierLegislatifResult } from "../model/dosleg";
+import { ActeLegislatif, DossierLegislatifResult } from "../model/dosleg";
 import { AgendaEvent, ReunionOdj } from "../types/agenda";
-export declare function buildOdj(events: AgendaEvent[], dossierBySenatUrl: Record<string, DossierLegislatifResult>): ReunionOdj | undefined;
-export declare function buildSenatDossierIndex(options: commandLineArgs.CommandLineOptions): Record<string, DossierLegislatifResult>;
+type DossierWithActes = DossierLegislatifResult & {
+    actes_legislatifs?: ActeLegislatif[] | null;
+};
+export declare function buildOdj(events: AgendaEvent[], dossierBySenatUrl: Record<string, DossierWithActes>): ReunionOdj | undefined;
+export declare function buildSenatDossierIndex(options: commandLineArgs.CommandLineOptions): Record<string, DossierWithActes>;
+export {};

package/lib/src/utils/reunion_parsing.d.ts

@@ -1,4 +1,5 @@
 import { DateTime } from "luxon";
+import type { AnyNode } from "domhandler";
 import { AgendaEvent, Reunion } from "../types/agenda";
 import { DossierLegislatifResult } from "../model/dosleg";
 import * as cheerio from "cheerio";
@@ -18,6 +19,6 @@ export type SommaireBlock = {
     startIndex: number;
     targetId?: string | null;
 };
-export declare function extractSommaireBlocks($: cheerio.CheerioAPI, idx: Map<any, number>): SommaireBlock[];
+export declare function extractSommaireBlocks($: cheerio.CheerioAPI, idx: Map<AnyNode, number>): SommaireBlock[];
 export declare function parseISO(iso: string | null | undefined): DateTime | null;
 export {};

package/lib/src/utils/reunion_parsing.js

@@ -50,8 +50,8 @@ export function buildReunionsByBucket(events, dossierBySenatUrl) {
     for (const e of events) {
         const kind = classifyAgendaType(e?.type);
         if (!kind) {
-            continue;
             console.warn("Can't determine type of reunion");
+            continue;
         }
         const bucket = typeToSuffixStrict(kind);
         const uid = makeReunionUid(e.date, kind, e.id, e.organe ?? null);
@@ -83,7 +83,7 @@ function classifyAgendaType(typeLabel) {
         return "MC";
     if (/\boffices\b|\bdelegations\b/.test(s))
         return "OD";
-    if (/\instances\b|\decisionelles\b/.test(s))
+    if (/instances\b|decisionelles\b/.test(s))
         return "ID";
     return null;
 }

package/lib/src/videos/match.js

@@ -8,11 +8,14 @@ export async function matchOneReunion(args) {
     if (!options["silent"])
         console.log(`Matching video for reunion: ${agenda?.uid}`);
     const isSP = (agenda.type ?? "").toLowerCase().includes("séance publique");
-    const minAcceptBase = weights?.minAccept;
-    const margin = weights?.margin;
-    const titleDominance = weights?.titleDominance;
-    const orgUncertainPenalty = weights?.orgUncertainPenalty; // 1 disables
-    const orgSkipDice = weights?.orgSkipDice;
+    if (!weights) {
+        throw new Error("matchOneReunion: missing weights");
+    }
+    const minAcceptBase = weights.minAccept;
+    const margin = weights.margin;
+    const titleDominance = weights.titleDominance ?? 0;
+    const orgUncertainPenalty = weights.orgUncertainPenalty ?? 1; // 1 disables
+    const orgSkipDice = weights.orgSkipDice ?? 0;
     const minAccept = minAcceptBase + (candidates.length >= 20 ? 0.08 : candidates.length >= 10 ? 0.05 : 0);
     const vw = weights
         ? {

package/lib/src/videos/pipeline.d.ts

@@ -1,13 +1,16 @@
 import { Reunion } from "../types/agenda";
 import { BestMatch, LastForVideo, MatchContext } from "./types";
 import { CommandLineOptions } from "command-line-args";
+type VideoPipelineOptions = CommandLineOptions & {
+    silent?: boolean;
+};
 export declare function processOneReunionMatch(args: {
     agenda: Reunion;
     best: BestMatch | null;
     baseDir: string;
     dataDir: string;
     session: number;
-    options: Record<string, any>;
+    options: VideoPipelineOptions;
     writeIfChanged: (p: string, content: string) => Promise<void>;
     lastByVideo: Map<string, {
         agendaUid: string;
@@ -34,7 +37,7 @@ export declare function processBisIfNeeded(args: {
         baseDir: string;
         dataDir: string;
         session: number;
-        options: Record<string, any>;
+        options: VideoPipelineOptions;
         writeIfChanged: (p: string, content: string) => Promise<void>;
         lastByVideo: Map<string, LastForVideo>;
         getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
@@ -50,3 +53,4 @@ export declare function processBisIfNeeded(args: {
     buildSenatVodMasterM3u8FromNvs: (dataNvs: string) => string | null;
 }): Promise<void>;
 export declare function writeIfChanged(p: string, content: string): Promise<void>;
+export {};

package/lib/src/videos/pipeline.js

@@ -5,6 +5,9 @@ import { fetchText } from "./search";
 import fs from "fs-extra";
 import fsp from "fs/promises";
 import path from "path";
+function isReunion(value) {
+    return typeof value === "object" && value !== null && "uid" in value;
+}
 export async function processOneReunionMatch(args) {
     const { agenda, best, baseDir, dataDir, session, options, writeIfChanged, lastByVideo, getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs, } = args;
     const reunionUid = agenda.uid;
@@ -14,7 +17,7 @@ export async function processOneReunionMatch(args) {
         dataTxt = await fsp.readFile(path.join(baseDir, "data.nvs"), "utf-8");
         finalTxt = await fsp.readFile(path.join(baseDir, "finalplayer.nvs"), "utf-8");
     }
-    catch (e) {
+    catch {
         console.warn(`[skip] Missing NVS files for reunion ${reunionUid}`);
         return;
     }
@@ -43,9 +46,10 @@ export async function processOneReunionMatch(args) {
         if (prev && prev.agendaJsonPath !== agendaJsonPath) {
             // micro-safety: do not close with an earlier timecode
             if (timecodeDebutVideo <= prev.start) {
-                console.warn(`[warn] timecode order inversion on same video: ` +
-                    `prev=${prev.agendaUid}(${prev.start}s) -> cur=${agenda.uid}(${timecodeDebutVideo}s). ` +
-                    `Skip closing prev to avoid negative segment.`);
+                console.warn("[warn] timecode order inversion on same video: " +
+                    `prev=${prev.agendaUid}(${prev.start}s) -> ` +
+                    `cur=${agenda.uid}(${timecodeDebutVideo}s). ` +
+                    "Skip closing prev to avoid negative segment.");
             }
             else {
                 await patchAgendaTimecodeFin({
@@ -63,10 +67,14 @@ export async function processOneReunionMatch(args) {
     try {
         obj = JSON.parse(raw);
     }
-    catch (e) {
+    catch {
         console.warn(`[warn] invalid JSON in ${agendaJsonPath}`);
         return;
     }
+    if (!isReunion(obj)) {
+        console.warn(`[warn] invalid reunion payload in ${agendaJsonPath}`);
+        return;
+    }
     const next = { ...obj, urlVideo: master, startTime: agenda.startTime, urlPageVideo: best?.pageUrl };
     if (timecodeDebutVideo != null) {
         next.timecodeDebutVideo = timecodeDebutVideo;
@@ -98,7 +106,7 @@ export async function processBisIfNeeded(args) {
     };
     const baseDirBis = path.join(path.dirname(ctx.baseDir), bisUid);
     await fs.ensureDir(baseDirBis);
-    await ensureBisAgendaJson({ agenda, agendaBis, dataDir: ctx.dataDir, session: ctx.session, options });
+    await ensureBisAgendaJson({ agenda, agendaBis, dataDir: ctx.dataDir, session: ctx.session });
     await downloadNvsForMatch(secondBest, baseDirBis);
     await processOneReunionMatch({
         agenda: agendaBis,
@@ -114,7 +122,7 @@ export async function processBisIfNeeded(args) {
     });
 }
 async function ensureBisAgendaJson(args) {
-    const { agenda, agendaBis, dataDir, session, options } = args;
+    const { agenda, agendaBis, dataDir, session } = args;
     const agendaJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agenda.uid}.json`);
     const agendaBisJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agendaBis.uid}.json`);
     if (!(await fs.pathExists(agendaJsonPath))) {
@@ -125,7 +133,8 @@ async function ensureBisAgendaJson(args) {
         const raw = await fsp.readFile(agendaJsonPath, "utf-8");
         const obj = JSON.parse(raw);
         if (!obj || typeof obj !== "object" || Array.isArray(obj)) {
-            console.warn(`[bis] cannot clone agenda json: expected object in ${agendaJsonPath}, got ${Array.isArray(obj) ? "array" : typeof obj}`);
+            console.warn(`[bis] cannot clone agenda json: expected object in ${agendaJsonPath}, ` +
+                `got ${Array.isArray(obj) ? "array" : typeof obj}`);
             return;
         }
         await writeIfChanged(agendaBisJsonPath, JSON.stringify(agendaBis, null, 2));
@@ -167,6 +176,10 @@ async function patchAgendaTimecodeFin(args) {
         console.warn(`[warn] invalid JSON in ${agendaJsonPath}`);
         return;
     }
+    if (typeof obj !== "object" || obj === null || Array.isArray(obj)) {
+        console.warn(`[warn] invalid reunion payload in ${agendaJsonPath}`);
+        return;
+    }
     const next = { ...obj, timecodeFinVideo };
     await writeIfChanged(agendaJsonPath, JSON.stringify(next, null, 2));
 }

package/lib/src/videos/search.js

@@ -55,7 +55,9 @@ export async function fetchCandidatesForAgenda(agenda, options) {
     const pages = await fetchAllSearchPages(searchParams);
     if (!pages.length) {
         if (!options["silent"]) {
-            console.log(`[miss] ${agenda.uid} no candidates (videotype=${searchParams.videotype}, organe=${searchParams.organe || "-"}, date=${searchParams.begin || "-"})`);
+            console.log(`[miss] ${agenda.uid} no candidates ` +
+                `(videotype=${searchParams.videotype}, organe=${searchParams.organe || "-"}, ` +
+                `date=${searchParams.begin || "-"})`);
         }
         return null;
     }
@@ -63,7 +65,9 @@ export async function fetchCandidatesForAgenda(agenda, options) {
     const candidates = extractCandidatesFromSearchHtml(combinedHtml).slice(0, MAX_CANDIDATES);
     if (!candidates.length) {
         if (!options["silent"]) {
-            console.log(`[miss] ${agenda.uid} no candidates after parse (videotype=${searchParams.videotype}, organe=${searchParams.organe || "-"}, date=${searchParams.begin || "-"})`);
+            console.log(`[miss] ${agenda.uid} no candidates after parse ` +
+                `(videotype=${searchParams.videotype}, organe=${searchParams.organe || "-"}, ` +
+                `date=${searchParams.begin || "-"})`);
         }
         return null;
     }

package/lib/strings.d.ts

@@ -0,0 +1 @@
+export declare function slugify(string: string, replacement?: string): string;

package/lib/strings.js

@@ -0,0 +1,18 @@
+import originalSlugify from "slug";
+const slugifyCharmap = {
+    ...originalSlugify.defaults.charmap,
+    "'": " ",
+    "@": " ",
+    ".": " ",
+    "-": "_",
+};
+export function slugify(string, replacement) {
+    const options = {
+        charmap: slugifyCharmap,
+        mode: "rfc3986",
+    };
+    if (replacement) {
+        options.replacement = replacement;
+    }
+    return originalSlugify(string, options);
+}

package/lib/strings.mjs

@@ -0,0 +1,18 @@
+import originalSlugify from "slug";
+const slugifyCharmap = {
+    ...originalSlugify.defaults.charmap,
+    "'": " ",
+    "@": " ",
+    ".": " ",
+    "-": "_",
+};
+export function slugify(string, replacement) {
+    const options = {
+        charmap: slugifyCharmap,
+        mode: "rfc3986",
+    };
+    if (replacement) {
+        options.replacement = replacement;
+    }
+    return originalSlugify(string, options);
+}

package/lib/strings.ts

@@ -0,0 +1,26 @@
+import originalSlugify from "slug"
+
+const slugifyCharmap = {
+  ...originalSlugify.defaults.charmap,
+  "'": " ",
+  "@": " ",
+  ".": " ",
+  "-": "_",
+}
+
+interface Options {
+  charmap: { [c: string]: string }
+  mode: string
+  replacement?: string
+}
+
+export function slugify(string: string, replacement?: string): string {
+  const options: Options = {
+    charmap: slugifyCharmap,
+    mode: "rfc3986",
+  }
+  if (replacement) {
+    options.replacement = replacement
+  }
+  return originalSlugify(string, options)
+}

package/lib/tests/incrementalImportSql.test.d.ts

@@ -0,0 +1 @@
+export {};