@wasto/cms-components 1.5.10 → 1.5.12

package/src/helpers/htmlContentToMarkdown.ts

@@ -1,114 +1,114 @@
-const HTML_HINT =
-    /<(table|thead|tbody|tr|td|th|p|div|h[1-6]|ul|ol|li|blockquote|pre|u|ins|strong|em|img|br)\b/i;
-
-export function looksLikeHtml(content: string): boolean {
-    return HTML_HINT.test(content);
-}
-
-function decodeEntities(value: string): string {
-    return value
-        .replace(/&nbsp;/gi, " ")
-        .replace(/&amp;/g, "&")
-        .replace(/&lt;/g, "<")
-        .replace(/&gt;/g, ">")
-        .replace(/&quot;/g, '"')
-        .replace(/&#39;/g, "'");
-}
-
-function stripTags(html: string): string {
-    return decodeEntities(
-        html
-            .replace(/<br\s*\/?>/gi, "\n")
-            .replace(/<\/p>/gi, "\n")
-            .replace(/<[^>]+>/g, "")
-            .replace(/\s+\n/g, "\n")
-            .replace(/\n\s+/g, "\n")
-            .replace(/[ \t]+/g, " ")
-            .trim(),
-    );
-}
-
-function cellText(html: string): string {
-    return stripTags(html).replace(/\n/g, " ").replace(/\|/g, "\\|");
-}
-
-export function htmlTableToGfm(tableHtml: string): string {
-    const rows = [...tableHtml.matchAll(/<tr[\s\S]*?<\/tr>/gi)].map((row) =>
-        [...row[0].matchAll(/<t[hd][\s\S]*?<\/t[hd]>/gi)].map((cell) => cellText(cell[0])),
-    );
-    if (rows.length === 0) return "";
-    const width = Math.max(...rows.map((r) => r.length), 1);
-    const padded = rows.map((r) => [...r, ...Array.from({ length: width - r.length }, () => "")]);
-    const header = padded[0];
-    const sep = header.map(() => "---");
-    return [
-        `| ${header.join(" | ")} |`,
-        `| ${sep.join(" | ")} |`,
-        ...padded.slice(1).map((r) => `| ${r.join(" | ")} |`),
-    ].join("\n");
-}
-
-function convertInline(html: string): string {
-    return html
-        .replace(/<(strong|b)>([\s\S]*?)<\/\1>/gi, "**$2**")
-        .replace(/<(em|i)>([\s\S]*?)<\/\1>/gi, "*$2*")
-        .replace(/<(u|ins)>([\s\S]*?)<\/\1>/gi, "++$2++")
-        .replace(/<code>([\s\S]*?)<\/code>/gi, "`$1`")
-        .replace(/<a\b[^>]*href=["']([^"']+)["'][^>]*>([\s\S]*?)<\/a>/gi, "[$2]($1)")
-        .replace(/<img\b[^>]*alt=["']([^"']*)["'][^>]*src=["']([^"']+)["'][^>]*\/?>/gi, "![$1]($2)")
-        .replace(/<img\b[^>]*src=["']([^"']+)["'][^>]*alt=["']([^"']*)["'][^>]*\/?>/gi, "![$2]($1)")
-        .replace(/<img\b[^>]*src=["']([^"']+)["'][^>]*\/?>/gi, "![]($1)")
-        .replace(/<br\s*\/?>/gi, "  \n");
-}
-
-/**
- * Converts leaked / legacy HTML (especially Tiptap tables and underline) to GFM.
- * Safe to run on mixed Markdown + HTML.
- */
-export function htmlContentToMarkdown(content: string): string {
-    if (!content || !looksLikeHtml(content)) return content;
-
-    let out = content.replace(
-        /<div[^>]*class="[^"]*tableWrapper[^"]*"[^>]*>([\s\S]*?)<\/div>/gi,
-        "$1",
-    );
-    out = out.replace(/<table[\s\S]*?<\/table>/gi, (table) => `\n\n${htmlTableToGfm(table)}\n\n`);
-    out = out.replace(/<(u|ins)>([\s\S]*?)<\/\1>/gi, "++$2++");
-
-    if (!looksLikeHtml(out)) {
-        return out.replace(/\n{3,}/g, "\n\n").trim();
-    }
-
-    out = out.replace(/<h([1-3])[^>]*>([\s\S]*?)<\/h\1>/gi, (_m, level: string, inner: string) => {
-        return `\n\n${"#".repeat(Number(level))} ${stripTags(convertInline(inner))}\n\n`;
-    });
-    out = out.replace(/<blockquote[^>]*>([\s\S]*?)<\/blockquote>/gi, (_m, inner: string) => {
-        const body = stripTags(convertInline(inner))
-            .split("\n")
-            .map((line) => `> ${line}`)
-            .join("\n");
-        return `\n\n${body}\n\n`;
-    });
-    out = out.replace(/<pre[^>]*><code[^>]*>([\s\S]*?)<\/code><\/pre>/gi, (_m, inner: string) => {
-        return `\n\n\`\`\`\n${decodeEntities(inner).replace(/<\/?code>/gi, "").trim()}\n\`\`\`\n\n`;
-    });
-    out = out.replace(/<ul[^>]*>([\s\S]*?)<\/ul>/gi, (_m, inner: string) => {
-        const items = [...String(inner).matchAll(/<li[^>]*>([\s\S]*?)<\/li>/gi)].map(
-            (item) => `- ${stripTags(convertInline(item[1]))}`,
-        );
-        return `\n\n${items.join("\n")}\n\n`;
-    });
-    out = out.replace(/<ol[^>]*>([\s\S]*?)<\/ol>/gi, (_m, inner: string) => {
-        const items = [...String(inner).matchAll(/<li[^>]*>([\s\S]*?)<\/li>/gi)].map(
-            (item, i) => `${i + 1}. ${stripTags(convertInline(item[1]))}`,
-        );
-        return `\n\n${items.join("\n")}\n\n`;
-    });
-    out = out.replace(/<p[^>]*>([\s\S]*?)<\/p>/gi, (_m, inner: string) => {
-        return `\n\n${stripTags(convertInline(inner))}\n\n`;
-    });
-    out = convertInline(out);
-    out = out.replace(/<\/?(div|span|tbody|thead|tfoot)[^>]*>/gi, "");
-    out = stripTags(out);
-    return out.replace(/\n{3,}/g, "\n\n").trim();
-}
+const HTML_HINT =
+    /<(table|thead|tbody|tr|td|th|p|div|h[1-6]|ul|ol|li|blockquote|pre|u|ins|strong|em|img|br)\b/i;
+
+export function looksLikeHtml(content: string): boolean {
+    return HTML_HINT.test(content);
+}
+
+function decodeEntities(value: string): string {
+    return value
+        .replace(/&nbsp;/gi, " ")
+        .replace(/&amp;/g, "&")
+        .replace(/&lt;/g, "<")
+        .replace(/&gt;/g, ">")
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;/g, "'");
+}
+
+function stripTags(html: string): string {
+    return decodeEntities(
+        html
+            .replace(/<br\s*\/?>/gi, "\n")
+            .replace(/<\/p>/gi, "\n")
+            .replace(/<[^>]+>/g, "")
+            .replace(/\s+\n/g, "\n")
+            .replace(/\n\s+/g, "\n")
+            .replace(/[ \t]+/g, " ")
+            .trim(),
+    );
+}
+
+function cellText(html: string): string {
+    return stripTags(html).replace(/\n/g, " ").replace(/\|/g, "\\|");
+}
+
+export function htmlTableToGfm(tableHtml: string): string {
+    const rows = [...tableHtml.matchAll(/<tr[\s\S]*?<\/tr>/gi)].map((row) =>
+        [...row[0].matchAll(/<t[hd][\s\S]*?<\/t[hd]>/gi)].map((cell) => cellText(cell[0])),
+    );
+    if (rows.length === 0) return "";
+    const width = Math.max(...rows.map((r) => r.length), 1);
+    const padded = rows.map((r) => [...r, ...Array.from({ length: width - r.length }, () => "")]);
+    const header = padded[0];
+    const sep = header.map(() => "---");
+    return [
+        `| ${header.join(" | ")} |`,
+        `| ${sep.join(" | ")} |`,
+        ...padded.slice(1).map((r) => `| ${r.join(" | ")} |`),
+    ].join("\n");
+}
+
+function convertInline(html: string): string {
+    return html
+        .replace(/<(strong|b)>([\s\S]*?)<\/\1>/gi, "**$2**")
+        .replace(/<(em|i)>([\s\S]*?)<\/\1>/gi, "*$2*")
+        .replace(/<(u|ins)>([\s\S]*?)<\/\1>/gi, "++$2++")
+        .replace(/<code>([\s\S]*?)<\/code>/gi, "`$1`")
+        .replace(/<a\b[^>]*href=["']([^"']+)["'][^>]*>([\s\S]*?)<\/a>/gi, "[$2]($1)")
+        .replace(/<img\b[^>]*alt=["']([^"']*)["'][^>]*src=["']([^"']+)["'][^>]*\/?>/gi, "![$1]($2)")
+        .replace(/<img\b[^>]*src=["']([^"']+)["'][^>]*alt=["']([^"']*)["'][^>]*\/?>/gi, "![$2]($1)")
+        .replace(/<img\b[^>]*src=["']([^"']+)["'][^>]*\/?>/gi, "![]($1)")
+        .replace(/<br\s*\/?>/gi, "  \n");
+}
+
+/**
+ * Converts leaked / legacy HTML (especially Tiptap tables and underline) to GFM.
+ * Safe to run on mixed Markdown + HTML.
+ */
+export function htmlContentToMarkdown(content: string): string {
+    if (!content || !looksLikeHtml(content)) return content;
+
+    let out = content.replace(
+        /<div[^>]*class="[^"]*tableWrapper[^"]*"[^>]*>([\s\S]*?)<\/div>/gi,
+        "$1",
+    );
+    out = out.replace(/<table[\s\S]*?<\/table>/gi, (table) => `\n\n${htmlTableToGfm(table)}\n\n`);
+    out = out.replace(/<(u|ins)>([\s\S]*?)<\/\1>/gi, "++$2++");
+
+    if (!looksLikeHtml(out)) {
+        return out.replace(/\n{3,}/g, "\n\n").trim();
+    }
+
+    out = out.replace(/<h([1-3])[^>]*>([\s\S]*?)<\/h\1>/gi, (_m, level: string, inner: string) => {
+        return `\n\n${"#".repeat(Number(level))} ${stripTags(convertInline(inner))}\n\n`;
+    });
+    out = out.replace(/<blockquote[^>]*>([\s\S]*?)<\/blockquote>/gi, (_m, inner: string) => {
+        const body = stripTags(convertInline(inner))
+            .split("\n")
+            .map((line) => `> ${line}`)
+            .join("\n");
+        return `\n\n${body}\n\n`;
+    });
+    out = out.replace(/<pre[^>]*><code[^>]*>([\s\S]*?)<\/code><\/pre>/gi, (_m, inner: string) => {
+        return `\n\n\`\`\`\n${decodeEntities(inner).replace(/<\/?code>/gi, "").trim()}\n\`\`\`\n\n`;
+    });
+    out = out.replace(/<ul[^>]*>([\s\S]*?)<\/ul>/gi, (_m, inner: string) => {
+        const items = [...String(inner).matchAll(/<li[^>]*>([\s\S]*?)<\/li>/gi)].map(
+            (item) => `- ${stripTags(convertInline(item[1]))}`,
+        );
+        return `\n\n${items.join("\n")}\n\n`;
+    });
+    out = out.replace(/<ol[^>]*>([\s\S]*?)<\/ol>/gi, (_m, inner: string) => {
+        const items = [...String(inner).matchAll(/<li[^>]*>([\s\S]*?)<\/li>/gi)].map(
+            (item, i) => `${i + 1}. ${stripTags(convertInline(item[1]))}`,
+        );
+        return `\n\n${items.join("\n")}\n\n`;
+    });
+    out = out.replace(/<p[^>]*>([\s\S]*?)<\/p>/gi, (_m, inner: string) => {
+        return `\n\n${stripTags(convertInline(inner))}\n\n`;
+    });
+    out = convertInline(out);
+    out = out.replace(/<\/?(div|span|tbody|thead|tfoot)[^>]*>/gi, "");
+    out = stripTags(out);
+    return out.replace(/\n{3,}/g, "\n\n").trim();
+}

package/src/helpers/layout.ts

@@ -1,54 +1,54 @@
-/**
- * Layout tokens from `.idea/maquette/00-tokens-et-style.md`.
- * Structural spacing only — colors/radii come from Theme (CMS custom).
- */
-export const SPACE = {
-    /** Horizontal padding for text / section content */
-    pageX: 16,
-    /** Tighter horizontal (search, chips, CTA bottom) */
-    pageXTight: 12,
-    /** Vertical gap between section header and content */
-    sectionY: 24,
-    /** Internal card / challenge row padding */
-    cardPad: 20,
-    /** Stack gap between list rows */
-    stack: 12,
-    /** Primary button height */
-    buttonH: 42,
-    /** Round icon hit target */
-    iconHit: 34,
-    /** Glyph inside icon hit */
-    iconGlyph: 18,
-    /** Approx. tab bar content height (excl. safe area) */
-    tabBarH: 86,
-    /** Next-collection card height (maquette ~196) */
-    collectionCardH: 196,
-    /** Next-collection card width target */
-    collectionCardW: 286,
-} as const;
-
-/** Suggested radii when building a maquette-aligned Theme (defaults, not hardcoded in UI). */
-export const MAQUETTE_RADII = {
-    sm: 12,
-    md: 16,
-    lg: 24,
-    pill: 999,
-    radius: 20,
-} as const;
-
-export const MAQUETTE_COLORS = {
-    background: "#F5F5F5",
-    surface: "#FFFFFF",
-    onSurface: "#090909",
-    onBackground: "#090909",
-    primary: "#00D100",
-    onPrimary: "#FFFFFF",
-    primarySoft: "#A6ECA6",
-    muted: "#9A9A9A",
-    border: "#E5E5E5",
-    success: "#FEEA16",
-    onSuccess: "#090909",
-    error: "#D16602",
-    onError: "#FFFFFF",
-    surfaceElevated: "#FFFFFF",
-} as const;
+/**
+ * Layout tokens from `.idea/maquette/00-tokens-et-style.md`.
+ * Structural spacing only — colors/radii come from Theme (CMS custom).
+ */
+export const SPACE = {
+    /** Horizontal padding for text / section content */
+    pageX: 16,
+    /** Tighter horizontal (search, chips, CTA bottom) */
+    pageXTight: 12,
+    /** Vertical gap between section header and content */
+    sectionY: 24,
+    /** Internal card / challenge row padding */
+    cardPad: 20,
+    /** Stack gap between list rows */
+    stack: 12,
+    /** Primary button height */
+    buttonH: 42,
+    /** Round icon hit target */
+    iconHit: 34,
+    /** Glyph inside icon hit */
+    iconGlyph: 18,
+    /** Approx. tab bar content height (excl. safe area) */
+    tabBarH: 86,
+    /** Next-collection card height (maquette ~196) */
+    collectionCardH: 196,
+    /** Next-collection card width target */
+    collectionCardW: 286,
+} as const;
+
+/** Suggested radii when building a maquette-aligned Theme (defaults, not hardcoded in UI). */
+export const MAQUETTE_RADII = {
+    sm: 12,
+    md: 16,
+    lg: 24,
+    pill: 999,
+    radius: 20,
+} as const;
+
+export const MAQUETTE_COLORS = {
+    background: "#F5F5F5",
+    surface: "#FFFFFF",
+    onSurface: "#090909",
+    onBackground: "#090909",
+    primary: "#00D100",
+    onPrimary: "#FFFFFF",
+    primarySoft: "#A6ECA6",
+    muted: "#9A9A9A",
+    border: "#E5E5E5",
+    success: "#FEEA16",
+    onSuccess: "#090909",
+    error: "#D16602",
+    onError: "#FFFFFF",
+    surfaceElevated: "#FFFFFF",
+} as const;

package/src/helpers/loadLinearGradient.ts

@@ -1,22 +1,22 @@
-type LinearGradientComponent = typeof import("expo-linear-gradient").LinearGradient;
-
-/**
- * Load LinearGradient only when the native ExpoLinearGradient module is available.
- * Returns null otherwise so callers can fall back to a solid View / color
- * (avoids RN "Component not implemented…").
- */
-export function loadLinearGradient(): LinearGradientComponent | null {
-    try {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        const { requireOptionalNativeModule } = require("expo-modules-core");
-        if (!requireOptionalNativeModule("ExpoLinearGradient")) {
-            return null;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        return require("expo-linear-gradient").LinearGradient as LinearGradientComponent;
-    } catch {
-        return null;
-    }
-}
-
-export const LinearGradientOrNull = loadLinearGradient();
+type LinearGradientComponent = typeof import("expo-linear-gradient").LinearGradient;
+
+/**
+ * Load LinearGradient only when the native ExpoLinearGradient module is available.
+ * Returns null otherwise so callers can fall back to a solid View / color
+ * (avoids RN "Component not implemented…").
+ */
+export function loadLinearGradient(): LinearGradientComponent | null {
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const { requireOptionalNativeModule } = require("expo-modules-core");
+        if (!requireOptionalNativeModule("ExpoLinearGradient")) {
+            return null;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        return require("expo-linear-gradient").LinearGradient as LinearGradientComponent;
+    } catch {
+        return null;
+    }
+}
+
+export const LinearGradientOrNull = loadLinearGradient();

package/src/helpers/mapLocations.ts

@@ -0,0 +1,170 @@
+import {
+    buildHoursSchedule,
+    type HoursDayRow,
+    type HoursStatus,
+} from "./hoursSchedule";
+
+export type LocationCategory = "recycling" | "decheterie" | "collection_place" | "sorting_center";
+
+export type MapLocation = {
+    id: string;
+    name: string;
+    category: LocationCategory;
+    address?: string;
+    phone?: string;
+    hoursDisplay?: string;
+    hoursRows?: HoursDayRow[];
+    hoursStatus?: HoursStatus | null;
+    lat: number;
+    lon: number;
+    badges?: string[];
+};
+
+export const LOCATION_CATEGORY_META: Record<
+    LocationCategory,
+    { label: string; color: string }
+> = {
+    recycling: { label: "Points de collecte", color: "#00C2EE" },
+    decheterie: { label: "Déchèteries", color: "#ea580c" },
+    collection_place: { label: "Lieux de ramassage", color: "#7c3aed" },
+    sorting_center: { label: "Centres de tri", color: "#8B00D8" },
+};
+
+export const REUNION_CENTER = { lat: -21.115, lon: 55.53 };
+
+/** GeoJSON order is [lon, lat]. Rejects NaN / out-of-range. */
+export function isValidLatLon(lat: number, lon: number): boolean {
+    return (
+        Number.isFinite(lat) &&
+        Number.isFinite(lon) &&
+        lat >= -90 &&
+        lat <= 90 &&
+        lon >= -180 &&
+        lon <= 180
+    );
+}
+
+function toNumber(value: unknown): number | null {
+    if (typeof value === "number") return Number.isFinite(value) ? value : null;
+    if (typeof value === "string" && value.trim() !== "") {
+        const n = Number(value);
+        return Number.isFinite(n) ? n : null;
+    }
+    return null;
+}
+
+/** Named lon/lat fields — no SVG conversion. */
+function parseLngLat(
+    lonCandidate: unknown,
+    latCandidate: unknown,
+): { lat: number; lon: number } | null {
+    const lon = toNumber(lonCandidate);
+    const lat = toNumber(latCandidate);
+    if (lon == null || lat == null || !isValidLatLon(lat, lon)) return null;
+    return { lat, lon };
+}
+
+/**
+ * Prefer WGS84 latitude/longitude. Legacy coordinateX/Y are aliases
+ * (X = longitude, Y = latitude) already in WGS84 after API migration.
+ */
+function parseRecyclingPointCoords(p: Record<string, unknown>): { lat: number; lon: number } | null {
+    const details =
+        p.details != null && typeof p.details === "object"
+            ? (p.details as Record<string, unknown>)
+            : null;
+
+    const named = parseLngLat(
+        p.longitude ?? p.lon ?? details?.longitude ?? details?.lon,
+        p.latitude ?? p.lat ?? details?.latitude ?? details?.lat,
+    );
+    if (named) return named;
+
+    // Legacy aliases: coordinateX = longitude, coordinateY = latitude
+    return parseLngLat(p.coordinateX, p.coordinateY);
+}
+
+function categorizeRecyclingType(type?: string): LocationCategory {
+    const t = (type ?? "").toLowerCase();
+    if (t.includes("déchèterie") || t.includes("decheterie") || t.includes("dechetterie")) {
+        return "decheterie";
+    }
+    if (t.includes("tri") || t.includes("sorting")) {
+        return "sorting_center";
+    }
+    return "recycling";
+}
+
+/** Normalise points de recyclage + lieux de collecte en pins carte. */
+export function normalizeMapLocations(
+    recyclingPoints: unknown[],
+    wasteCollectionPlaces: unknown[],
+): MapLocation[] {
+    const out: MapLocation[] = [];
+
+    for (const raw of recyclingPoints) {
+        const p = raw as Record<string, unknown>;
+        const coords = parseRecyclingPointCoords(p);
+        if (!coords) continue;
+        const id = String(p.id ?? "");
+        if (!id) continue;
+        const hoursSource = {
+            hours: typeof p.hours === "string" ? p.hours : null,
+            details:
+                p.details != null && typeof p.details === "object"
+                    ? (p.details as Record<string, unknown>)
+                    : null,
+        };
+        const schedule = buildHoursSchedule(hoursSource);
+        out.push({
+            id: `rp-${id}`,
+            name: String(p.name ?? "Point de collecte"),
+            category: categorizeRecyclingType(typeof p.type === "string" ? p.type : undefined),
+            address: typeof p.address === "string" ? p.address : undefined,
+            phone: typeof p.phone === "string" ? p.phone : undefined,
+            hoursDisplay: schedule.summary ?? undefined,
+            hoursRows: schedule.rows.length ? schedule.rows : undefined,
+            hoursStatus: schedule.status,
+            lat: coords.lat,
+            lon: coords.lon,
+            badges: schedule.status
+                ? [schedule.status.text]
+                : schedule.summary
+                  ? [schedule.summary]
+                  : undefined,
+        });
+    }
+
+    for (const raw of wasteCollectionPlaces) {
+        const place = raw as Record<string, unknown>;
+        const locs = Array.isArray(place.attachedLocations) ? place.attachedLocations : [];
+        const loc = locs.find((item) => {
+            const l = item as Record<string, unknown>;
+            return l.latitude != null && l.longitude != null;
+        }) as Record<string, unknown> | undefined;
+        if (!loc) continue;
+        const coords = parseLngLat(loc.longitude, loc.latitude);
+        if (!coords) continue;
+        const id = String(place.id ?? loc.id ?? "");
+        if (!id) continue;
+        out.push({
+            id: `cp-${id}`,
+            name: String(place.name ?? loc.name ?? "Lieu de ramassage"),
+            category: "collection_place",
+            address: typeof loc.reference === "string" ? loc.reference : undefined,
+            lat: coords.lat,
+            lon: coords.lon,
+        });
+    }
+
+    return out;
+}
+
+export function computeMapCenter(locations: MapLocation[]): { lat: number; lon: number } {
+    const valid = locations.filter((l) => isValidLatLon(l.lat, l.lon));
+    if (valid.length === 0) return REUNION_CENTER;
+    const lat = valid.reduce((sum, l) => sum + l.lat, 0) / valid.length;
+    const lon = valid.reduce((sum, l) => sum + l.lon, 0) / valid.length;
+    if (!isValidLatLon(lat, lon)) return REUNION_CENTER;
+    return { lat, lon };
+}