From e728f9b04fa7fec8a6abf7922b309a1f665b90e6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Tue, 5 Nov 2024 09:27:31 +0100
Subject: [PATCH] types(cache): resolved value is not nullable (#2848)

---
 src/runtime/internal/cache.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/runtime/internal/cache.ts b/src/runtime/internal/cache.ts
index b278f5f71e..8d1bc93f51 100644
--- a/src/runtime/internal/cache.ts
+++ b/src/runtime/internal/cache.ts
@@ -31,10 +31,12 @@ function defaultCacheOptions() {
   } as const;
 }
 
+type ResolvedCacheEntry<T> = CacheEntry<T> & { value: T };
+
 export function defineCachedFunction<T, ArgsT extends unknown[] = any[]>(
   fn: (...args: ArgsT) => T | Promise<T>,
   opts: CacheOptions<T, ArgsT> = {}
-): (...args: ArgsT) => Promise<T | undefined> {
+): (...args: ArgsT) => Promise<T> {
   opts = { ...defaultCacheOptions(), ...opts };
 
   const pending: { [key: string]: Promise<T> } = {};
@@ -50,7 +52,7 @@ export function defineCachedFunction<T, ArgsT extends unknown[] = any[]>(
     resolver: () => T | Promise<T>,
     shouldInvalidateCache?: boolean,
     event?: H3Event
-  ): Promise<CacheEntry<T>> {
+  ): Promise<ResolvedCacheEntry<T>> {
     // Use extension for key to avoid conflicting with parent namespace (foo/bar and foo/bar/baz)
     const cacheKey = [opts.base, group, name, key + ".json"]
       .filter(Boolean)
@@ -148,10 +150,10 @@ export function defineCachedFunction<T, ArgsT extends unknown[] = any[]>(
         console.error(`[nitro] [cache] SWR handler error.`, error);
         useNitroApp().captureError(error, { event, tags: ["cache"] });
       });
-      return entry;
+      return entry as ResolvedCacheEntry<T>;
     }
 
-    return _resolvePromise.then(() => entry);
+    return _resolvePromise.then(() => entry) as Promise<ResolvedCacheEntry<T>>;
   }
 
   return async (...args) => {