@ffflorian/api-client 2.1.6 → 2.2.0

package/README.md

@@ -1,6 +1,6 @@
 # api-client [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![npm version](https://img.shields.io/npm/v/@ffflorian/api-client.svg?style=flat)](https://www.npmjs.com/package/@ffflorian/api-client)
 
-Simple API client using fetch ([Node.js](https://nodejs.org/api/globals.html#fetch) / [Web](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API))
+A simple API client using fetch ([Node.js](https://nodejs.org/api/globals.html#fetch) / [Web](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API)).
 
 ## Prerequisites
 

package/dist/APIClient.d.ts

@@ -1,11 +1,8 @@
-import type { APIResponse, BasicRequestOptions, ApiClientConfig, RequestInterceptor, ResponseInterceptor, RequestOptions } from './types.js';
+import type { APIResponse, BasicRequestOptions, ApiClientConfig, Interceptors, RequestOptions } from './types.js';
 export declare class APIClient {
     private baseUrl;
     private config?;
-    interceptors: {
-        request: RequestInterceptor[];
-        response: ResponseInterceptor[];
-    };
+    interceptors: Interceptors;
     constructor(baseUrl: string, config?: ApiClientConfig | undefined);
     setBaseURL(baseUrl: string): void;
     setConfig(config: Partial<RequestInit>): void;

package/dist/APIClient.js

@@ -29,7 +29,7 @@ export class APIClient {
     }
     async request(endpoint, options) {
         var _a;
-        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)) {
                 if (param !== null && param !== undefined) {
@@ -39,6 +39,7 @@ export class APIClient {
         }
         let requestOptions = {
             method: options.method.toUpperCase(),
+            url,
             ...this.config,
         };
         if (options.headers) {
@@ -67,9 +68,10 @@ 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}`);

package/dist/types.d.ts

@@ -11,12 +11,18 @@ export type ApiClientConfig = Partial<Omit<RequestInit, 'method'>> & {
         username: string;
     };
 };
-export type BasicRequestOptions = Omit<RequestOptions, 'method'>;
-export type RequestInitWithMethod = Required<Pick<RequestInit, 'method'>> & Omit<RequestInit, 'method'>;
-export type RequestInterceptor = (url: URL, options: RequestInitWithMethod) => RequestInitWithMethod | Promise<RequestInitWithMethod>;
-export type ResponseInterceptor = (response: Response) => void | Promise<void>;
 export interface APIResponse<T> {
     data: T;
     headers: Headers;
     status: number;
 }
+export type BasicRequestOptions = Omit<RequestOptions, 'method'>;
+export interface Interceptors {
+    request: RequestInterceptor[];
+    response: ResponseInterceptor[];
+}
+export type RequestInitWithMethodAndURL = Required<Pick<RequestInit, 'method'>> & Omit<RequestInit, 'method'> & {
+    url: URL;
+};
+export type RequestInterceptor = (options: RequestInitWithMethodAndURL) => RequestInitWithMethodAndURL | Promise<RequestInitWithMethodAndURL>;
+export type ResponseInterceptor = (response: Response) => void | Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "author": "Florian Imdahl <git@ffflorian.de>",
-  "description": "Simple API client using fetch",
+  "description": "A simple API client using fetch",
   "devDependencies": {
     "rimraf": "6.1.2",
     "typescript": "5.9.3"
@@ -15,7 +15,6 @@
   "keywords": [
     "api-client",
     "fetch",
-    "cli",
     "typescript"
   ],
   "license": "GPL-3.0",
@@ -29,5 +28,5 @@
     "test": "exit 0"
   },
   "type": "module",
-  "version": "2.1.6"
+  "version": "2.2.0"
 }