@wasto/cms-components 1.5.10 → 1.5.11

package/src/helpers/maquetteTheme.ts

@@ -1,76 +1,76 @@
-import type { Theme } from "../types/Theme";
-import { MAQUETTE_COLORS, MAQUETTE_RADII } from "./layout";
-
-/**
- * Default theme aligned with `.idea/maquette` tokens.
- * Runtime apps override via CMS `config.theme` (console).
- */
-export function createMaquetteTheme(overrides?: Partial<Theme>): Theme {
-    const base: Theme = {
-        colors: {
-            primary: MAQUETTE_COLORS.primary,
-            onPrimary: MAQUETTE_COLORS.onPrimary,
-            surface: MAQUETTE_COLORS.surface,
-            onSurface: MAQUETTE_COLORS.onSurface,
-            background: MAQUETTE_COLORS.background,
-            onBackground: MAQUETTE_COLORS.onBackground,
-            success: MAQUETTE_COLORS.success,
-            onSuccess: MAQUETTE_COLORS.onSuccess,
-            error: MAQUETTE_COLORS.error,
-            onError: MAQUETTE_COLORS.onError,
-            border: MAQUETTE_COLORS.border,
-            primarySoft: MAQUETTE_COLORS.primarySoft,
-            surfaceElevated: MAQUETTE_COLORS.surfaceElevated,
-            muted: MAQUETTE_COLORS.muted,
-            gradient: {
-                from: MAQUETTE_COLORS.primary,
-                to: MAQUETTE_COLORS.primarySoft,
-            },
-        },
-        radius: MAQUETTE_RADII.radius,
-        radii: {
-            sm: MAQUETTE_RADII.sm,
-            md: MAQUETTE_RADII.md,
-            lg: MAQUETTE_RADII.lg,
-            pill: MAQUETTE_RADII.pill,
-        },
-        shadow: {
-            card: {
-                shadowColor: "#0F172A",
-                shadowOffset: { width: 0, height: 1 },
-                shadowOpacity: 0.06,
-                shadowRadius: 3,
-                elevation: 1,
-            },
-            soft: {
-                shadowColor: "#0F172A",
-                shadowOffset: { width: 0, height: 1 },
-                shadowOpacity: 0.04,
-                shadowRadius: 2,
-                elevation: 1,
-            },
-        },
-    };
-
-    if (!overrides) return base;
-
-    return {
-        ...base,
-        ...overrides,
-        colors: {
-            ...base.colors,
-            ...overrides.colors,
-            gradient: {
-                ...base.colors.gradient,
-                ...overrides.colors?.gradient,
-            },
-        },
-        radii: overrides.radii ? { ...base.radii!, ...overrides.radii } : base.radii,
-        shadow: overrides.shadow
-            ? {
-                  card: { ...base.shadow!.card, ...overrides.shadow.card },
-                  soft: { ...base.shadow!.soft, ...overrides.shadow.soft },
-              }
-            : base.shadow,
-    };
-}
+import type { Theme } from "../types/Theme";
+import { MAQUETTE_COLORS, MAQUETTE_RADII } from "./layout";
+
+/**
+ * Default theme aligned with `.idea/maquette` tokens.
+ * Runtime apps override via CMS `config.theme` (console).
+ */
+export function createMaquetteTheme(overrides?: Partial<Theme>): Theme {
+    const base: Theme = {
+        colors: {
+            primary: MAQUETTE_COLORS.primary,
+            onPrimary: MAQUETTE_COLORS.onPrimary,
+            surface: MAQUETTE_COLORS.surface,
+            onSurface: MAQUETTE_COLORS.onSurface,
+            background: MAQUETTE_COLORS.background,
+            onBackground: MAQUETTE_COLORS.onBackground,
+            success: MAQUETTE_COLORS.success,
+            onSuccess: MAQUETTE_COLORS.onSuccess,
+            error: MAQUETTE_COLORS.error,
+            onError: MAQUETTE_COLORS.onError,
+            border: MAQUETTE_COLORS.border,
+            primarySoft: MAQUETTE_COLORS.primarySoft,
+            surfaceElevated: MAQUETTE_COLORS.surfaceElevated,
+            muted: MAQUETTE_COLORS.muted,
+            gradient: {
+                from: MAQUETTE_COLORS.primary,
+                to: MAQUETTE_COLORS.primarySoft,
+            },
+        },
+        radius: MAQUETTE_RADII.radius,
+        radii: {
+            sm: MAQUETTE_RADII.sm,
+            md: MAQUETTE_RADII.md,
+            lg: MAQUETTE_RADII.lg,
+            pill: MAQUETTE_RADII.pill,
+        },
+        shadow: {
+            card: {
+                shadowColor: "#0F172A",
+                shadowOffset: { width: 0, height: 1 },
+                shadowOpacity: 0.06,
+                shadowRadius: 3,
+                elevation: 1,
+            },
+            soft: {
+                shadowColor: "#0F172A",
+                shadowOffset: { width: 0, height: 1 },
+                shadowOpacity: 0.04,
+                shadowRadius: 2,
+                elevation: 1,
+            },
+        },
+    };
+
+    if (!overrides) return base;
+
+    return {
+        ...base,
+        ...overrides,
+        colors: {
+            ...base.colors,
+            ...overrides.colors,
+            gradient: {
+                ...base.colors.gradient,
+                ...overrides.colors?.gradient,
+            },
+        },
+        radii: overrides.radii ? { ...base.radii!, ...overrides.radii } : base.radii,
+        shadow: overrides.shadow
+            ? {
+                  card: { ...base.shadow!.card, ...overrides.shadow.card },
+                  soft: { ...base.shadow!.soft, ...overrides.shadow.soft },
+              }
+            : base.shadow,
+    };
+}

package/src/helpers/markdownUnderlinePlugin.ts

@@ -1,32 +1,32 @@
-/**
- * Parses `++text++` as underline (`ins`), matching Console Turndown output.
- */
-export function markdownUnderlinePlugin(md: {
-    inline: {
-        ruler: {
-            after: (name: string, ruleName: string, fn: (state: any, silent: boolean) => boolean) => void;
-        };
-    };
-}): void {
-    md.inline.ruler.after("emphasis", "underline", (state: any, silent: boolean) => {
-        if (
-            state.src.charCodeAt(state.pos) !== 0x2b ||
-            state.src.charCodeAt(state.pos + 1) !== 0x2b
-        ) {
-            return false;
-        }
-        const close = state.src.indexOf("++", state.pos + 2);
-        if (close < state.pos + 2) return false;
-        if (silent) return true;
-
-        const content = state.src.slice(state.pos + 2, close);
-        const open = state.push("ins_open", "ins", 1);
-        open.markup = "++";
-        const text = state.push("text", "", 0);
-        text.content = content;
-        const end = state.push("ins_close", "ins", -1);
-        end.markup = "++";
-        state.pos = close + 2;
-        return true;
-    });
-}
+/**
+ * Parses `++text++` as underline (`ins`), matching Console Turndown output.
+ */
+export function markdownUnderlinePlugin(md: {
+    inline: {
+        ruler: {
+            after: (name: string, ruleName: string, fn: (state: any, silent: boolean) => boolean) => void;
+        };
+    };
+}): void {
+    md.inline.ruler.after("emphasis", "underline", (state: any, silent: boolean) => {
+        if (
+            state.src.charCodeAt(state.pos) !== 0x2b ||
+            state.src.charCodeAt(state.pos + 1) !== 0x2b
+        ) {
+            return false;
+        }
+        const close = state.src.indexOf("++", state.pos + 2);
+        if (close < state.pos + 2) return false;
+        if (silent) return true;
+
+        const content = state.src.slice(state.pos + 2, close);
+        const open = state.push("ins_open", "ins", 1);
+        open.markup = "++";
+        const text = state.push("text", "", 0);
+        text.content = content;
+        const end = state.push("ins_close", "ins", -1);
+        end.markup = "++";
+        state.pos = close + 2;
+        return true;
+    });
+}

package/src/helpers/nextCollection.ts

@@ -0,0 +1,122 @@
+import { getContrastColor } from "./getContrastColor";
+
+export type City = {
+    id: string;
+    name: string;
+    status?: "NON_ACTIF" | "INCOMPLET" | "ACTIF" | "MAINTENANCE";
+    [key: string]: unknown;
+};
+
+export type WasteType = {
+    id: string;
+    name?: string;
+    icon?: string;
+    imageUrl?: string | null;
+    color?: string;
+    [key: string]: unknown;
+};
+
+export type WasteCollectionPlace = {
+    id: string;
+    name?: string;
+    collectionDays?: Array<{
+        /** Ex: "Lundi", "Mardi", ... (mapping lundi=0 … dimanche=6) */
+        name: string;
+        wasteTypeId: string;
+        biweekly?: boolean;
+        startDate?: string;
+    }>;
+    /** Périodes d’exception (pas de collecte) */
+    exceptions?: Array<{ dateFrom: string; dateTo: string }>;
+    [key: string]: unknown;
+};
+
+export type CollectionForDay = {
+    id: string;
+    name: string;
+    icon?: string;
+    imageUrl?: string | null;
+    color?: string;
+    contrastColor?: "#000000" | "#FFFFFF";
+};
+
+const DAY_MAPPING: Record<string, number> = {
+    Dimanche: 6,
+    Lundi: 0,
+    Mardi: 1,
+    Mercredi: 2,
+    Jeudi: 3,
+    Vendredi: 4,
+    Samedi: 5,
+};
+
+export function getDateLabel(offset: number): string {
+    if (offset === -1) return "hier";
+    if (offset === 0) return "Aujourd'hui";
+    if (offset === 1) return "Demain";
+    return offset < 0 ? `Il y a ${Math.abs(offset)} jours` : `Dans ${offset} jours`;
+}
+
+export function getCollectionsForDay(
+    wasteTypes: WasteType[],
+    wasteCollectionPlaces: WasteCollectionPlace[],
+    dateOffset: number,
+    selectedPlaceId?: string | null,
+): CollectionForDay[] {
+    if (!wasteCollectionPlaces?.length) return [];
+
+    const place = selectedPlaceId
+        ? wasteCollectionPlaces.find((p) => p.id === selectedPlaceId) ?? wasteCollectionPlaces[0]
+        : wasteCollectionPlaces[0];
+
+    const schedule = place?.collectionDays ?? [];
+    const exceptions = place?.exceptions ?? [];
+
+    const targetDate = new Date();
+    targetDate.setDate(targetDate.getDate() + dateOffset);
+    const dayOfWeek = targetDate.getDay();
+    const mondayBasedDay = dayOfWeek === 0 ? 6 : dayOfWeek - 1;
+
+    const results: CollectionForDay[] = [];
+    const seen = new Set<string>();
+
+    for (const day of schedule) {
+        if (DAY_MAPPING[day.name] !== mondayBasedDay) continue;
+
+        const hasException = exceptions.some((exc) => {
+            const from = new Date(exc.dateFrom + "T00:00:00");
+            const to = new Date(exc.dateTo + "T00:00:00");
+            return targetDate.getTime() >= from.getTime() && targetDate.getTime() < to.getTime();
+        });
+        if (hasException) continue;
+
+        if (day.biweekly && day.startDate) {
+            const start = new Date(day.startDate);
+            const diffDays = Math.floor(
+                (targetDate.getTime() - start.getTime()) / (1000 * 60 * 60 * 24),
+            );
+            const weeks = Math.floor(diffDays / 7);
+            if (weeks < 0 || weeks % 2 !== 0) continue;
+        }
+
+        const wt = wasteTypes.find((w) => w.id === day.wasteTypeId);
+        if (!wt) continue;
+
+        if (seen.has(wt.id)) continue;
+        seen.add(wt.id);
+
+        results.push({
+            id: wt.id,
+            name: wt.name ?? "",
+            icon: typeof wt.icon === "string" ? wt.icon : undefined,
+            imageUrl: typeof wt.imageUrl === "string" ? wt.imageUrl : undefined,
+            color: typeof wt.color === "string" ? wt.color : undefined,
+            contrastColor:
+                typeof wt.color === "string" && wt.color.trim()
+                    ? getContrastColor(wt.color.trim())
+                    : undefined,
+        });
+    }
+
+    return results;
+}

package/src/helpers/normalizeWasteTypeRecyclingInfo.ts

@@ -1,80 +1,80 @@
-import type { WasteType } from "../hooks/useNextCollection";
-
-export type RecyclingInfoDetail = {
-    id: string | number;
-    material?: string;
-    description?: string;
-    imageUrl?: string;
-};
-
-export type RecyclingInfoItem = {
-    id: string;
-    /** Alias explicite de `id` (utile côté UI/props). */
-    wasteTypeId: string;
-    name: string;
-    description?: string;
-    icon?: string;
-    imageUrl?: string;
-    color?: string;
-    colorLight?: string;
-    rules?: string[];
-    details?: RecyclingInfoDetail[];
-};
-
-export function normalizeWasteTypeToRecyclingInfo(wt: WasteType): RecyclingInfoItem | null {
-    const id = typeof wt?.id === "string" ? wt.id : null;
-    if (!id) return null;
-
-    const extended = wt as WasteType & {
-        description?: unknown;
-        colorLight?: unknown;
-        details?: unknown;
-        rules?: unknown;
-        imageUrl?: unknown;
-    };
-
-    const detailsRaw = extended.details;
-    const details = Array.isArray(detailsRaw)
-        ? detailsRaw
-              .map((raw: unknown, idx: number) => {
-                  const d = raw && typeof raw === "object" ? (raw as Record<string, unknown>) : {};
-                  const rid = d.id;
-                  const detailId =
-                      typeof rid === "string" || typeof rid === "number" ? rid : `${id}-${idx}`;
-                  const imageUrl =
-                      typeof d.imageUrl === "string" && d.imageUrl.trim()
-                          ? d.imageUrl.trim()
-                          : undefined;
-                  return {
-                      id: detailId,
-                      material: typeof d.material === "string" ? d.material : undefined,
-                      description: typeof d.description === "string" ? d.description : undefined,
-                      imageUrl,
-                  };
-              })
-              .filter((d) => d.material || d.description || d.imageUrl)
-        : undefined;
-
-    const rulesRaw = extended.rules;
-    const rules = Array.isArray(rulesRaw)
-        ? rulesRaw.filter((r): r is string => typeof r === "string" && r.trim().length > 0)
-        : undefined;
-
-    const imageUrl =
-        typeof extended.imageUrl === "string" && extended.imageUrl.trim()
-            ? extended.imageUrl.trim()
-            : undefined;
-
-    return {
-        id,
-        wasteTypeId: id,
-        name: typeof wt.name === "string" ? wt.name : "",
-        description: typeof extended.description === "string" ? extended.description : undefined,
-        icon: typeof wt.icon === "string" ? wt.icon : undefined,
-        imageUrl,
-        color: typeof wt.color === "string" ? wt.color : undefined,
-        colorLight: typeof extended.colorLight === "string" ? extended.colorLight : undefined,
-        rules,
-        details,
-    };
-}
+import type { WasteType } from "../hooks/useNextCollection";
+
+export type RecyclingInfoDetail = {
+    id: string | number;
+    material?: string;
+    description?: string;
+    imageUrl?: string;
+};
+
+export type RecyclingInfoItem = {
+    id: string;
+    /** Alias explicite de `id` (utile côté UI/props). */
+    wasteTypeId: string;
+    name: string;
+    description?: string;
+    icon?: string;
+    imageUrl?: string;
+    color?: string;
+    colorLight?: string;
+    rules?: string[];
+    details?: RecyclingInfoDetail[];
+};
+
+export function normalizeWasteTypeToRecyclingInfo(wt: WasteType): RecyclingInfoItem | null {
+    const id = typeof wt?.id === "string" ? wt.id : null;
+    if (!id) return null;
+
+    const extended = wt as WasteType & {
+        description?: unknown;
+        colorLight?: unknown;
+        details?: unknown;
+        rules?: unknown;
+        imageUrl?: unknown;
+    };
+
+    const detailsRaw = extended.details;
+    const details = Array.isArray(detailsRaw)
+        ? detailsRaw
+              .map((raw: unknown, idx: number) => {
+                  const d = raw && typeof raw === "object" ? (raw as Record<string, unknown>) : {};
+                  const rid = d.id;
+                  const detailId =
+                      typeof rid === "string" || typeof rid === "number" ? rid : `${id}-${idx}`;
+                  const imageUrl =
+                      typeof d.imageUrl === "string" && d.imageUrl.trim()
+                          ? d.imageUrl.trim()
+                          : undefined;
+                  return {
+                      id: detailId,
+                      material: typeof d.material === "string" ? d.material : undefined,
+                      description: typeof d.description === "string" ? d.description : undefined,
+                      imageUrl,
+                  };
+              })
+              .filter((d) => d.material || d.description || d.imageUrl)
+        : undefined;
+
+    const rulesRaw = extended.rules;
+    const rules = Array.isArray(rulesRaw)
+        ? rulesRaw.filter((r): r is string => typeof r === "string" && r.trim().length > 0)
+        : undefined;
+
+    const imageUrl =
+        typeof extended.imageUrl === "string" && extended.imageUrl.trim()
+            ? extended.imageUrl.trim()
+            : undefined;
+
+    return {
+        id,
+        wasteTypeId: id,
+        name: typeof wt.name === "string" ? wt.name : "",
+        description: typeof extended.description === "string" ? extended.description : undefined,
+        icon: typeof wt.icon === "string" ? wt.icon : undefined,
+        imageUrl,
+        color: typeof wt.color === "string" ? wt.color : undefined,
+        colorLight: typeof extended.colorLight === "string" ? extended.colorLight : undefined,
+        rules,
+        details,
+    };
+}

package/src/helpers/publicMediaUrl.ts

@@ -1,8 +1,8 @@
-export function publicMediaUrl(
-    apiUrl: string,
-    mediaId: string | null | undefined
-): string | null {
-    const id = (mediaId ?? "").trim();
-    if (!id) return null;
-    return `${apiUrl.replace(/\/$/, "")}/public/cms/media/${encodeURIComponent(id)}/file`;
-}
+export function publicMediaUrl(
+    apiUrl: string,
+    mediaId: string | null | undefined
+): string | null {
+    const id = (mediaId ?? "").trim();
+    if (!id) return null;
+    return `${apiUrl.replace(/\/$/, "")}/public/cms/media/${encodeURIComponent(id)}/file`;
+}

package/src/helpers/resolveApiAssetUrl.ts

@@ -1,21 +1,21 @@
-/** Résout une URL d’asset API (chemin `/public/...` ou URL absolue / data:). */
-export function resolveApiAssetUrl(
-    apiUrl: string,
-    url: string | null | undefined,
-): string | null {
-    const v = (url ?? "").trim();
-    if (!v) return null;
-    if (
-        v.startsWith("data:") ||
-        v.startsWith("http://") ||
-        v.startsWith("https://") ||
-        v.startsWith("file:") ||
-        v.startsWith("blob:")
-    ) {
-        return v;
-    }
-    if (v.startsWith("/")) {
-        return `${apiUrl.replace(/\/$/, "")}${v}`;
-    }
-    return v;
-}
+/** Résout une URL d’asset API (chemin `/public/...` ou URL absolue / data:). */
+export function resolveApiAssetUrl(
+    apiUrl: string,
+    url: string | null | undefined,
+): string | null {
+    const v = (url ?? "").trim();
+    if (!v) return null;
+    if (
+        v.startsWith("data:") ||
+        v.startsWith("http://") ||
+        v.startsWith("https://") ||
+        v.startsWith("file:") ||
+        v.startsWith("blob:")
+    ) {
+        return v;
+    }
+    if (v.startsWith("/")) {
+        return `${apiUrl.replace(/\/$/, "")}${v}`;
+    }
+    return v;
+}

package/src/helpers/systemRoutes.ts

@@ -1,7 +1,7 @@
-/** Fixed Expo Router paths for shell screens (apps générées + playground). */
-export const SYSTEM_ROUTES = {
-    notifications: "/(system)/notifications",
-    profile: "/(system)/profile",
-} as const;
-
-export type SystemRouteKey = keyof typeof SYSTEM_ROUTES;
+/** Fixed Expo Router paths for shell screens (apps générées + playground). */
+export const SYSTEM_ROUTES = {
+    notifications: "/(system)/notifications",
+    profile: "/(system)/profile",
+} as const;
+
+export type SystemRouteKey = keyof typeof SYSTEM_ROUTES;