@wasto/cms-components 1.5.10 → 1.5.12

package/src/contexts/WastoContext.tsx

@@ -1,127 +1,132 @@
-import {
-    createContext,
-    PropsWithChildren,
-    useContext,
-    useEffect,
-    useMemo,
-    type ReactNode,
-} from "react";
-import type { WastoRequestErrorContext } from "@wasto/sdk";
-import { Theme } from "../types/Theme";
-import { ThemeProvider } from "./ThemeContext";
-import { LocalProvider } from "./LocalContext";
-import { ChallengesProvider } from "./ChallengesContext";
-import { AnnouncementsProvider } from "./AnnouncementsContext";
-import SelectStreetModal from "../components/select-street-modal/SelectStreetModal";
-import { AnnouncementModal } from "../components/announcement-modal/AnnouncementModal";
-import { OptionalSafeAreaProvider } from "../components/safe-area/OptionalSafeAreaProvider";
-import {
-    initWastoSentry,
-    reportError as sentryReportError,
-    type WastoErrorContext,
-    type WastoSentryConfig,
-} from "../sentry/initSentry";
-
-export type WastoContextType = {
-    apiUrl: string;
-    appId: string;
-    cityGroupId: string | null;
-    /**
-     * Studio / iframe preview — no anonymous device registration or challenge writes.
-     */
-    previewMode: boolean;
-    reportError: (error: unknown, context?: WastoErrorContext) => void;
-    onRequestError?: (error: Error, context: WastoRequestErrorContext) => void;
-};
-
-export const WastoContext = createContext<WastoContextType | undefined>(undefined);
-
-export type WastoProviderProps = PropsWithChildren & {
-    apiUrl: string;
-    appId: string;
-    theme: Theme;
-    /** City group scoping street search / multi-city apps. */
-    cityGroupId?: string | null;
-    /** GitLab Error Tracking / Sentry config (DSN from env). */
-    sentry?: WastoSentryConfig;
-    /**
-     * When true (Studio preview): LocalContext skips analytics.track / device id.
-     */
-    previewMode?: boolean;
-};
-
-export function WastoProvider(props: WastoProviderProps): ReactNode {
-    const apiUrl = useMemo(() => props.apiUrl, [props.apiUrl]);
-    const appId = useMemo(() => props.appId, [props.appId]);
-    const cityGroupId = useMemo(
-        () => props.cityGroupId?.trim() || null,
-        [props.cityGroupId],
-    );
-    const previewMode = Boolean(props.previewMode);
-    const sentryConfig = props.sentry;
-
-    useEffect(() => {
-        if (!sentryConfig) return;
-        initWastoSentry({
-            ...sentryConfig,
-            appId: sentryConfig.appId ?? appId,
-        });
-    }, [appId, sentryConfig]);
-
-    const reportError = useMemo(
-        () => (error: unknown, context?: WastoErrorContext) => {
-            sentryReportError(error, context);
-        },
-        [],
-    );
-
-    const onRequestError = useMemo(
-        () => (error: Error, ctx: WastoRequestErrorContext) => {
-            reportError(error, {
-                source: "api",
-                method: ctx.method,
-                path: ctx.path,
-                status: ctx.status,
-            });
-        },
-        [reportError],
-    );
-
-    const value = useMemo<WastoContextType>(
-        () => ({
-            apiUrl,
-            appId,
-            cityGroupId,
-            previewMode,
-            reportError,
-            onRequestError,
-        }),
-        [apiUrl, appId, cityGroupId, previewMode, reportError, onRequestError],
-    );
-
-    return (
-        <WastoContext value={value}>
-            <OptionalSafeAreaProvider>
-                <LocalProvider previewMode={previewMode}>
-                    <ChallengesProvider>
-                        <AnnouncementsProvider apiUrl={apiUrl}>
-                            <ThemeProvider theme={props.theme}>
-                                {props.children}
-                                <SelectStreetModal />
-                                <AnnouncementModal />
-                            </ThemeProvider>
-                        </AnnouncementsProvider>
-                    </ChallengesProvider>
-                </LocalProvider>
-            </OptionalSafeAreaProvider>
-        </WastoContext>
-    );
-}
-
-export function useWasto() {
-    const context = useContext(WastoContext);
-    if (!context) {
-        throw new Error("useContext must be used within a WastoProvider.");
-    }
-    return context;
-}
+import {
+    createContext,
+    PropsWithChildren,
+    useContext,
+    useEffect,
+    useMemo,
+    type ReactNode,
+} from "react";
+import type { WastoRequestErrorContext } from "@wasto/sdk";
+import { Theme } from "../types/Theme";
+import { ThemeProvider } from "./ThemeContext";
+import { LocalProvider } from "./LocalContext";
+import { AppDataProvider } from "./AppDataContext";
+import { ChallengesProvider } from "./ChallengesContext";
+import { AnnouncementsProvider } from "./AnnouncementsContext";
+import SelectStreetModal from "../components/select-street-modal/SelectStreetModal";
+import { AnnouncementModal } from "../components/announcement-modal/AnnouncementModal";
+import { PushTokenRegistrar } from "../components/push/PushTokenRegistrar";
+import { OptionalSafeAreaProvider } from "../components/safe-area/OptionalSafeAreaProvider";
+import {
+    initWastoSentry,
+    reportError as sentryReportError,
+    type WastoErrorContext,
+    type WastoSentryConfig,
+} from "../sentry/initSentry";
+
+export type WastoContextType = {
+    apiUrl: string;
+    appId: string;
+    cityGroupId: string | null;
+    /**
+     * Studio / iframe preview — no anonymous device registration or challenge writes.
+     */
+    previewMode: boolean;
+    reportError: (error: unknown, context?: WastoErrorContext) => void;
+    onRequestError?: (error: Error, context: WastoRequestErrorContext) => void;
+};
+
+export const WastoContext = createContext<WastoContextType | undefined>(undefined);
+
+export type WastoProviderProps = PropsWithChildren & {
+    apiUrl: string;
+    appId: string;
+    theme: Theme;
+    /** City group scoping street search / multi-city apps. */
+    cityGroupId?: string | null;
+    /** GitLab Error Tracking / Sentry config (DSN from env). */
+    sentry?: WastoSentryConfig;
+    /**
+     * When true (Studio preview): LocalContext skips analytics.track / device id.
+     */
+    previewMode?: boolean;
+};
+
+export function WastoProvider(props: WastoProviderProps): ReactNode {
+    const apiUrl = useMemo(() => props.apiUrl, [props.apiUrl]);
+    const appId = useMemo(() => props.appId, [props.appId]);
+    const cityGroupId = useMemo(
+        () => props.cityGroupId?.trim() || null,
+        [props.cityGroupId],
+    );
+    const previewMode = Boolean(props.previewMode);
+    const sentryConfig = props.sentry;
+
+    useEffect(() => {
+        if (!sentryConfig) return;
+        initWastoSentry({
+            ...sentryConfig,
+            appId: sentryConfig.appId ?? appId,
+        });
+    }, [appId, sentryConfig]);
+
+    const reportError = useMemo(
+        () => (error: unknown, context?: WastoErrorContext) => {
+            sentryReportError(error, context);
+        },
+        [],
+    );
+
+    const onRequestError = useMemo(
+        () => (error: Error, ctx: WastoRequestErrorContext) => {
+            reportError(error, {
+                source: "api",
+                method: ctx.method,
+                path: ctx.path,
+                status: ctx.status,
+            });
+        },
+        [reportError],
+    );
+
+    const value = useMemo<WastoContextType>(
+        () => ({
+            apiUrl,
+            appId,
+            cityGroupId,
+            previewMode,
+            reportError,
+            onRequestError,
+        }),
+        [apiUrl, appId, cityGroupId, previewMode, reportError, onRequestError],
+    );
+
+    return (
+        <WastoContext value={value}>
+            <OptionalSafeAreaProvider>
+                <LocalProvider previewMode={previewMode}>
+                    <PushTokenRegistrar />
+                    <ChallengesProvider>
+                        <AnnouncementsProvider apiUrl={apiUrl}>
+                            <ThemeProvider theme={props.theme}>
+                                <AppDataProvider apiUrl={apiUrl}>
+                                    {props.children}
+                                    <SelectStreetModal />
+                                    <AnnouncementModal />
+                                </AppDataProvider>
+                            </ThemeProvider>
+                        </AnnouncementsProvider>
+                    </ChallengesProvider>
+                </LocalProvider>
+            </OptionalSafeAreaProvider>
+        </WastoContext>
+    );
+}
+
+export function useWasto() {
+    const context = useContext(WastoContext);
+    if (!context) {
+        throw new Error("useContext must be used within a WastoProvider.");
+    }
+    return context;
+}

package/src/helpers/blogPost.ts

@@ -1,72 +1,72 @@
-import { htmlContentToMarkdown } from "./htmlContentToMarkdown";
-
-export type BlogPost = {
-    id: string;
-    title: string;
-    content: string;
-    publishedAt?: string;
-    createdAt?: string;
-    coverMediaId?: string | null;
-};
-
-function asRecord(raw: unknown): Record<string, unknown> | null {
-    if (raw == null || typeof raw !== "object") return null;
-    const root = raw as Record<string, unknown>;
-    if (root.data != null && typeof root.data === "object") {
-        return root.data as Record<string, unknown>;
-    }
-    return root;
-}
-
-function pickStr(o: Record<string, unknown>, camel: string, snake?: string): string | undefined {
-    const v = o[camel] ?? (snake ? o[snake] : undefined);
-    return typeof v === "string" ? v : undefined;
-}
-
-export function normalizeBlogPost(raw: unknown): BlogPost | null {
-    const o = asRecord(raw);
-    if (!o) return null;
-
-    const idRaw = o.id;
-    const id = typeof idRaw === "string" ? idRaw : idRaw != null ? String(idRaw) : "";
-    if (!id) return null;
-
-    const coverFromRelation =
-        o.coverMedia != null && typeof o.coverMedia === "object"
-            ? (o.coverMedia as { id?: unknown }).id
-            : undefined;
-
-    return {
-        id,
-        title: pickStr(o, "title") || "Sans titre",
-        content: pickStr(o, "content") || "",
-        publishedAt: pickStr(o, "publishedAt", "published_at"),
-        createdAt: pickStr(o, "createdAt", "created_at"),
-        coverMediaId:
-            pickStr(o, "coverMediaId", "cover_media_id") ??
-            (typeof coverFromRelation === "string" ? coverFromRelation : null),
-    };
-}
-
-export function stripToExcerpt(content: string, maxLen = 180): string {
-    const fromHtml = htmlContentToMarkdown(content);
-    const plain = fromHtml
-        .replace(/```[\s\S]*?```/g, " ")
-        .replace(/`[^`]*`/g, " ")
-        .replace(/!\[[^\]]*]\([^)]*\)/g, " ")
-        .replace(/\[[^\]]*]\([^)]*\)/g, " ")
-        .replace(/\+\+([^+]+)\+\+/g, "$1")
-        .replace(/[#>*_~\-|]+/g, " ")
-        .replace(/\s+/g, " ")
-        .trim();
-    if (plain.length <= maxLen) return plain;
-    return `${plain.slice(0, maxLen).trim()}…`;
-}
-
-export function formatArticleDate(value?: string): string | undefined {
-    if (!value) return undefined;
-    const slice = value.length >= 10 ? value.slice(0, 10) : value;
-    const date = new Date(slice);
-    if (Number.isNaN(date.getTime())) return slice;
-    return date.toLocaleDateString("fr-FR", { day: "numeric", month: "long", year: "numeric" });
-}
+import { htmlContentToMarkdown } from "./htmlContentToMarkdown";
+
+export type BlogPost = {
+    id: string;
+    title: string;
+    content: string;
+    publishedAt?: string;
+    createdAt?: string;
+    coverMediaId?: string | null;
+};
+
+function asRecord(raw: unknown): Record<string, unknown> | null {
+    if (raw == null || typeof raw !== "object") return null;
+    const root = raw as Record<string, unknown>;
+    if (root.data != null && typeof root.data === "object") {
+        return root.data as Record<string, unknown>;
+    }
+    return root;
+}
+
+function pickStr(o: Record<string, unknown>, camel: string, snake?: string): string | undefined {
+    const v = o[camel] ?? (snake ? o[snake] : undefined);
+    return typeof v === "string" ? v : undefined;
+}
+
+export function normalizeBlogPost(raw: unknown): BlogPost | null {
+    const o = asRecord(raw);
+    if (!o) return null;
+
+    const idRaw = o.id;
+    const id = typeof idRaw === "string" ? idRaw : idRaw != null ? String(idRaw) : "";
+    if (!id) return null;
+
+    const coverFromRelation =
+        o.coverMedia != null && typeof o.coverMedia === "object"
+            ? (o.coverMedia as { id?: unknown }).id
+            : undefined;
+
+    return {
+        id,
+        title: pickStr(o, "title") || "Sans titre",
+        content: pickStr(o, "content") || "",
+        publishedAt: pickStr(o, "publishedAt", "published_at"),
+        createdAt: pickStr(o, "createdAt", "created_at"),
+        coverMediaId:
+            pickStr(o, "coverMediaId", "cover_media_id") ??
+            (typeof coverFromRelation === "string" ? coverFromRelation : null),
+    };
+}
+
+export function stripToExcerpt(content: string, maxLen = 180): string {
+    const fromHtml = htmlContentToMarkdown(content);
+    const plain = fromHtml
+        .replace(/```[\s\S]*?```/g, " ")
+        .replace(/`[^`]*`/g, " ")
+        .replace(/!\[[^\]]*]\([^)]*\)/g, " ")
+        .replace(/\[[^\]]*]\([^)]*\)/g, " ")
+        .replace(/\+\+([^+]+)\+\+/g, "$1")
+        .replace(/[#>*_~\-|]+/g, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+    if (plain.length <= maxLen) return plain;
+    return `${plain.slice(0, maxLen).trim()}…`;
+}
+
+export function formatArticleDate(value?: string): string | undefined {
+    if (!value) return undefined;
+    const slice = value.length >= 10 ? value.slice(0, 10) : value;
+    const date = new Date(slice);
+    if (Number.isNaN(date.getTime())) return slice;
+    return date.toLocaleDateString("fr-FR", { day: "numeric", month: "long", year: "numeric" });
+}