fix response cache extension type (#1883)

* fix response cache extension type * add changeset
n1ru4l · Jun 20, 2023 · 84eb5b4 · 84eb5b4
1 parent 413853d
commit 84eb5b4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 44 deletions.
diff --git a/.changeset/thin-fishes-unite.md b/.changeset/thin-fishes-unite.md
@@ -0,0 +1,5 @@
+---
+'@envelop/response-cache': patch
+---
+
+fix response cache extensions type
diff --git a/packages/plugins/response-cache/src/plugin.ts b/packages/plugins/response-cache/src/plugin.ts
@@ -182,7 +182,7 @@ export type ResponseCacheExtensions =
       ttl: number;
     }
   | {
-      invalidatedEntities: string[];
+      invalidatedEntities: CacheEntityRecord[];
     };
 
 export type ResponseCacheExecutionResult = ExecutionResult<
@@ -389,16 +389,11 @@ export function useResponseCache<PluginContext extends Record<string, any> = {}>
 
               cache.invalidate(identifier.values());
               if (includeExtensionMetadata) {
-                setResult({
-                  ...processedResult,
-                  extensions: {
-                    ...processedResult.extensions,
-                    responseCache: {
-                      ...processedResult.extensions?.responseCache,
-                      invalidatedEntities: Array.from(identifier.values()),
-                    },
-                  },
-                });
+                setResult(
+                  resultWithMetadata(processedResult, {
+                    invalidatedEntities: Array.from(identifier.values()),
+                  }),
+                );
               }
             },
           };
@@ -417,16 +412,9 @@ export function useResponseCache<PluginContext extends Record<string, any> = {}>
 
         if (cachedResponse != null) {
           if (includeExtensionMetadata) {
-            onExecuteParams.setResultAndStopExecution({
-              ...cachedResponse,
-              extensions: {
-                ...cachedResponse.extensions,
-                responseCache: {
-                  ...cachedResponse.extensions?.responseCache,
-                  hit: true,
-                },
-              },
-            });
+            onExecuteParams.setResultAndStopExecution(
+              resultWithMetadata(cachedResponse, { hit: true }),
+            );
           } else {
             onExecuteParams.setResultAndStopExecution(cachedResponse);
           }
@@ -478,42 +466,39 @@ export function useResponseCache<PluginContext extends Record<string, any> = {}>
 
           if (finalTtl === 0) {
             if (includeExtensionMetadata) {
-              setResult({
-                ...processedResult,
-                extensions: {
-                  ...processedResult.extensions,
-                  responseCache: {
-                    ...processedResult.extensions?.responseCache,
-                    hit: false,
-                    didCache: false,
-                  },
-                },
-              });
+              setResult(resultWithMetadata(processedResult, { hit: false, didCache: false }));
             }
             return;
           }
 
           cache.set(cacheKey, processedResult, identifier.values(), finalTtl);
           if (includeExtensionMetadata) {
-            setResult({
-              ...processedResult,
-              extensions: {
-                ...processedResult.extensions,
-                responseCache: {
-                  ...processedResult.extensions?.responseCache,
-                  hit: false,
-                  didCache: true,
-                  ttl: finalTtl,
-                },
-              },
-            });
+            setResult(
+              resultWithMetadata(processedResult, { hit: false, didCache: true, ttl: finalTtl }),
+            );
           }
         },
       };
     },
   };
 }
 
+function resultWithMetadata(
+  result: ExecutionResult,
+  metadata: ResponseCacheExtensions,
+): ResponseCacheExecutionResult {
+  return {
+    ...result,
+    extensions: {
+      ...result.extensions,
+      responseCache: {
+        ...(result as ResponseCacheExecutionResult).extensions?.responseCache,
+        ...metadata,
+      },
+    },
+  };
+}
+
 function calculateTtl(typeTtl: number, currentTtl: number | undefined): number {
   if (typeof currentTtl === 'number') {
     return Math.min(currentTtl, typeTtl);