fix: keeping backward compatibility, propagate AxiosResponse where it…

… should be
arthurfiorette · Dec 19, 2024 · 7b10ca9 · 7b10ca9
1 parent 45715f1
commit 7b10ca9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/cache/axios.ts b/src/cache/axios.ts
@@ -30,7 +30,7 @@ export interface CacheAxiosResponse<R = any, D = any> extends AxiosResponse<R, D
    *
    * @see https://axios-cache-interceptor.js.org/config/response-object#id
    */
-  id?: string;
+  id: string;
 
   /**
    * A simple boolean indicating if the request returned data from the cache or from the
@@ -43,7 +43,7 @@ export interface CacheAxiosResponse<R = any, D = any> extends AxiosResponse<R, D
    *
    * @see https://axios-cache-interceptor.js.org/config/response-object#cached
    */
-  cached?: boolean;
+  cached: boolean;
 
   /**
    * A simple boolean indicating if the request returned data is from valid or stale cache.
@@ -124,7 +124,7 @@ export interface AxiosCacheInstance extends CacheInstance, AxiosInstance {
 
   interceptors: {
     request: AxiosInterceptorManager<InternalCacheRequestConfig>;
-    response: AxiosInterceptorManager<CacheAxiosResponse>;
+    response: AxiosInterceptorManager<AxiosResponse>;
   };
 
   /** @template D The type that the request body use */

diff --git a/src/cache/cache.ts b/src/cache/cache.ts
@@ -1,4 +1,4 @@
-import type { Method } from 'axios';
+import type { AxiosResponse, Method } from 'axios';
 import type { Deferred } from 'fast-defer';
 import type { HeaderInterpreter } from '../header/types.js';
 import type { AxiosInterceptor } from '../interceptors/build.js';
@@ -321,7 +321,7 @@ export interface CacheInstance {
    * @default defaultResponseInterceptor
    * @see https://axios-cache-interceptor.js.org/config#responseinterceptor
    */
-  responseInterceptor: AxiosInterceptor<CacheAxiosResponse<unknown, unknown>>;
+  responseInterceptor: AxiosInterceptor<AxiosResponse<unknown, unknown>>;
 
   /**
    * The debug option will print debug information in the console. It is good if you need

diff --git a/src/interceptors/build.ts b/src/interceptors/build.ts
@@ -1,4 +1,5 @@
-import type { CacheAxiosResponse, InternalCacheRequestConfig } from '../cache/axios.js';
+import type { AxiosResponse } from 'axios';
+import type { InternalCacheRequestConfig } from '../cache/axios.js';
 
 /** See {@link AxiosInterceptorManager} */
 export interface AxiosInterceptor<T> {
@@ -11,4 +12,4 @@ export interface AxiosInterceptor<T> {
 }
 
 export type RequestInterceptor = AxiosInterceptor<InternalCacheRequestConfig<unknown, unknown>>;
-export type ResponseInterceptor = AxiosInterceptor<CacheAxiosResponse<unknown, unknown>>;
+export type ResponseInterceptor = AxiosInterceptor<AxiosResponse<unknown, unknown>>;
diff --git a/src/interceptors/response.ts b/src/interceptors/response.ts
@@ -34,7 +34,7 @@ export function defaultResponseInterceptor(axios: AxiosCacheInstance): ResponseI
     }
   };
 
-  const onFulfilled: ResponseInterceptor['onFulfilled'] = async (response) => {
+  const onFulfilled: ResponseInterceptor['onFulfilled'] = async (response: CacheAxiosResponse) => {
     // When response.config is not present, the response is indeed a error.
     if (!response?.config) {
       if (__ACI_DEV__) {