feat(api-client): Move URL to config in interceptor

Author: ffflorian

packages/api-client/src/APIClient.ts

@@ -3,7 +3,7 @@ import type {
   BasicRequestOptions,
   ApiClientConfig,
   Interceptors,
-  RequestInitWithMethod,
+  RequestInitWithMethodAndURL,
   RequestOptions,
 } from './types.js';
 
@@ -42,7 +42,7 @@ export class APIClient {
   }
 
   async request(endpoint: string, options: RequestOptions): Promise<Response> {
-    const url = new URL(endpoint, this.baseUrl);
+    let url = new URL(endpoint, this.baseUrl);
 
     if (options.params) {
       for (const [key, param] of Object.entries(options.params)) {
@@ -52,8 +52,9 @@ export class APIClient {
       }
     }
 
-    let requestOptions: RequestInitWithMethod = {
+    let requestOptions: RequestInitWithMethodAndURL = {
       method: options.method.toUpperCase(),
+      url,
       ...this.config,
     };
 
@@ -87,10 +88,12 @@ export class APIClient {
 
     if (this.interceptors.request.length > 0) {
       for (const interceptor of this.interceptors.request) {
-        requestOptions = await interceptor(url, requestOptions);
+        requestOptions = {...requestOptions, ...(await interceptor({...requestOptions, url}))};
       }
     }
 
+    url = requestOptions.url;
+
     const response = await fetch(url, requestOptions);
     if (!response.ok) {
       throw new Error(`Request failed with status code ${response.status}`);

packages/api-client/src/types.ts

@@ -35,11 +35,13 @@ export interface Interceptors {
   response: ResponseInterceptor[];
 }
 
-export type RequestInitWithMethod = Required<Pick<RequestInit, 'method'>> & Omit<RequestInit, 'method'>;
+export type RequestInitWithMethodAndURL = Required<Pick<RequestInit, 'method'>> &
+  Omit<RequestInit, 'method'> & {
+    url: URL;
+  };
 
 export type RequestInterceptor = (
-  url: URL,
-  options: RequestInitWithMethod
-) => RequestInitWithMethod | Promise<RequestInitWithMethod>;
+  options: RequestInitWithMethodAndURL
+) => RequestInitWithMethodAndURL | Promise<RequestInitWithMethodAndURL>;
 
 export type ResponseInterceptor = (response: Response) => void | Promise<void>;