From fc27361e37151221d2fb8203ec96f1d31c88b234 Mon Sep 17 00:00:00 2001
From: Jack Kingsman <jack.kingsman@gmail.com>
Date: Fri, 27 Feb 2026 18:48:39 -0800
Subject: [PATCH] Fix prefetch type glitch

---
 frontend/src/prefetch.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/src/prefetch.ts b/frontend/src/prefetch.ts
index 3bb55d2..f5b7bdf 100644
--- a/frontend/src/prefetch.ts
+++ b/frontend/src/prefetch.ts
@@ -8,21 +8,21 @@
 import type { AppSettings, Channel, Contact, RadioConfig, UnreadCounts } from './types';
 
 interface PrefetchMap {
-  config?: Promise<RadioConfig>;
-  settings?: Promise<AppSettings>;
-  channels?: Promise<Channel[]>;
-  contacts?: Promise<Contact[]>;
-  unreads?: Promise<UnreadCounts>;
-  undecryptedCount?: Promise<{ count: number }>;
+  config: Promise<RadioConfig>;
+  settings: Promise<AppSettings>;
+  channels: Promise<Channel[]>;
+  contacts: Promise<Contact[]>;
+  unreads: Promise<UnreadCounts>;
+  undecryptedCount: Promise<{ count: number }>;
 }
 
-const store: PrefetchMap = (window as unknown as { __prefetch?: PrefetchMap }).__prefetch ?? {};
+const store: Partial<PrefetchMap> =
+  (window as unknown as { __prefetch?: Partial<PrefetchMap> }).__prefetch ?? {};
 
-type PrefetchResolved<K extends keyof PrefetchMap> =
-  PrefetchMap[K] extends Promise<infer T> ? T : never;
+type PrefetchResolved<K extends keyof PrefetchMap> = Awaited<PrefetchMap[K]>;
 
 /** Take a prefetched promise (consumed once, then gone). */
-export function takePrefetch<K extends keyof PrefetchMap>(key: K): PrefetchMap[K] {
+export function takePrefetch<K extends keyof PrefetchMap>(key: K): PrefetchMap[K] | undefined {
   const p = store[key];
   delete store[key];
   return p;
@@ -42,7 +42,7 @@ export async function takePrefetchOrFetch<K extends keyof PrefetchMap>(
   }
 
   try {
-    return await prefetched;
+    return (await prefetched) as PrefetchResolved<K>;
   } catch (err) {
     console.warn(`Prefetch for "${String(key)}" failed, falling back to live fetch.`, err);
     return fallback();