@ffflorian/api-client 1.0.13 → 2.1.0

package/README.md

@@ -1,57 +1,27 @@
-# api-client [![npm version](https://img.shields.io/npm/v/@ffflorian/api-client.svg)](https://www.npmjs.com/package/@ffflorian/api-client)
+# 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)
 
-A generic 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))
 
-### Installation
+## Prerequisites
 
-Run `yarn add @ffflorian/api-client` or `npm install @ffflorian/api-client`.
+- [Node.js](https://nodejs.org) >= 14
+- npm (preinstalled) or [yarn](https://classic.yarnpkg.com)
 
-## Usage
+## Installation
 
-A complete documentation is available at https://ffflorian.github.io/api-clients/packages/api-client/.
+ℹ️ This is a pure [ESM](https://nodejs.org/api/esm.html#introduction) module.
 
-### Examples
+Run `yarn global add @ffflorian/api-client` or `npm i -g @ffflorian/api-client`.
 
-```ts
-import {APIClient} from '@ffflorian/api-client';
-
-const apiClient = new APIClient('https://example.com/api/v1');
-
-apiClient.requestService
-  .get('/endpoint', {
-    headers: {
-      Authorization: 'my-api-key',
-    },
-  })
-  .then(data => {
-    // ...
-  });
-```
+## Usage
 
 ```ts
 import {APIClient} from '@ffflorian/api-client';
 
-const apiClient = new APIClient({
-  apiUrl: 'https://example.com/api/v1',
-  requestInjector: config => {
-    const hawkHeader = hawk.client.header(config.url, config.method, {credentials});
-    return {
-      ...config,
-      headers: {
-        Authorization: hawkHeader.header,
-      },
-    };
-  },
-});
-
-apiClient.requestService.get('/endpoint').then(data => {
-  // ...
-});
-```
-
-## Build
-
-```
-yarn
-yarn dist
+const apiClient = new APIClient();
+try {
+  const data = await apiClient.get('https://example.com');
+} catch (error) {
+  console.error(error);
+}
 ```

package/dist/APIClient.d.ts

@@ -1,25 +1,21 @@
-import { RequestInjectorFn, RequestService } from './RequestService';
-export interface ClientOptions<T> {
-    /** The API URL (e.g. "https://example.com/api/v1"). */
-    apiUrl: string;
-    /** An optional injector which alters every Axios request configuration before the request is sent. */
-    requestInjector?: RequestInjectorFn<T>;
-}
-export declare class APIClient<T = any> {
-    readonly requestService: RequestService<T>;
-    private readonly options;
-    constructor(apiUrl: string);
-    constructor(options: ClientOptions<T>);
-    /** Remove the request injector. */
-    removeRequestInjector(): void;
-    /**
-     * Set a new API URL.
-     * @param newUrl The new API url
-     */
-    setApiUrl(newUrl: string): void;
-    /**
-     * Set a (new) request injector.
-     * @param requestInjector The new request injector.
-     */
-    setRequestInjector(requestInjector: RequestInjectorFn<T>): void;
+import type { APIResponse, BasicRequestOptions, ApiClientConfig, RequestInterceptor, ResponseInterceptor, RequestOptions } from './types.js';
+export declare class APIClient {
+    private baseUrl;
+    private config?;
+    interceptors: {
+        request: RequestInterceptor[];
+        response: ResponseInterceptor[];
+    };
+    constructor(baseUrl: string, config?: ApiClientConfig | undefined);
+    setBaseURL(baseUrl: string): void;
+    setConfig(config: Partial<RequestInit>): void;
+    private formatData;
+    request(endpoint: string, options: RequestOptions): Promise<Response>;
+    delete<T = any>(endpoint: string, options?: BasicRequestOptions): Promise<APIResponse<T>>;
+    get<T = any>(endpoint: string, options?: BasicRequestOptions): Promise<APIResponse<T>>;
+    head<T = any>(endpoint: string, options?: BasicRequestOptions): Promise<APIResponse<T>>;
+    patch<T = any>(endpoint: string, data?: any, options?: BasicRequestOptions): Promise<APIResponse<T>>;
+    options<T = any>(endpoint: string, options?: BasicRequestOptions): Promise<APIResponse<T>>;
+    post<T = any>(endpoint: string, data?: any, options?: BasicRequestOptions): Promise<APIResponse<T>>;
+    put<T = any>(endpoint: string, data?: any, options?: BasicRequestOptions): Promise<APIResponse<T>>;
 }

package/dist/APIClient.js

@@ -1,35 +1,119 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.APIClient = void 0;
-const RequestService_1 = require("./RequestService");
-class APIClient {
-    constructor(options) {
-        if (typeof options === 'string') {
-            options = { apiUrl: options };
-        }
-        this.options = options;
-        this.requestService = new RequestService_1.RequestService(options);
-    }
-    /** Remove the request injector. */
-    removeRequestInjector() {
-        delete this.options.requestInjector;
-        this.requestService.removeRequestInjector();
-    }
-    /**
-     * Set a new API URL.
-     * @param newUrl The new API url
-     */
-    setApiUrl(newUrl) {
-        this.requestService.setApiUrl(newUrl);
-    }
-    /**
-     * Set a (new) request injector.
-     * @param requestInjector The new request injector.
-     */
-    setRequestInjector(requestInjector) {
-        this.options.requestInjector = requestInjector;
-        this.requestService.setRequestInjector(requestInjector);
+export class APIClient {
+    constructor(baseUrl, config) {
+        this.baseUrl = baseUrl;
+        this.config = config;
+        this.interceptors = {
+            request: [],
+            response: [],
+        };
+    }
+    setBaseURL(baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+    setConfig(config) {
+        this.config = config;
+    }
+    formatData(response, options) {
+        const responseType = (options === null || options === void 0 ? void 0 : options.responseType) || 'json';
+        switch (responseType) {
+            case 'arraybuffer':
+                return response.arrayBuffer();
+            case 'blob':
+                return response.blob();
+            case 'text':
+                return response.text();
+            case 'json':
+            default:
+                return response.json();
+        }
+    }
+    async request(endpoint, options) {
+        var _a;
+        const url = new URL(endpoint, this.baseUrl);
+        if (options.params) {
+            for (const [key, param] of Object.entries(options.params)) {
+                if (param !== null && param !== undefined) {
+                    url.searchParams.append(key, String(param));
+                }
+            }
+        }
+        let requestOptions = {
+            method: options.method.toUpperCase(),
+            ...this.config,
+        };
+        if (options.headers) {
+            requestOptions.headers = {
+                ...requestOptions.headers,
+                ...options.headers,
+            };
+        }
+        if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.auth) {
+            const { username, password } = this.config.auth;
+            const encoded = btoa(`${username}:${password}`);
+            requestOptions.headers = {
+                ...requestOptions.headers,
+                Authorization: `Basic ${encoded}`,
+            };
+        }
+        if (options.data) {
+            if (options.data instanceof Object) {
+                requestOptions.headers = {
+                    ...requestOptions.headers,
+                    'Content-Type': 'application/json',
+                };
+                options.data = JSON.stringify(options.data);
+            }
+            requestOptions.body = options.data;
+        }
+        if (this.interceptors.request.length > 0) {
+            for (const interceptor of this.interceptors.request) {
+                requestOptions = await interceptor(url, requestOptions);
+            }
+        }
+        const response = await fetch(url, requestOptions);
+        if (!response.ok) {
+            throw new Error(`${options.method.toUpperCase()} request failed: ${response.statusText}`);
+        }
+        if (this.interceptors.response.length > 0) {
+            for (const interceptor of this.interceptors.response) {
+                await interceptor(response);
+            }
+        }
+        return response;
+    }
+    async delete(endpoint, options) {
+        const request = await this.request(endpoint, { ...options, method: 'DELETE' });
+        const requestData = await this.formatData(request, options);
+        return { data: requestData, headers: request.headers, status: request.status };
+    }
+    async get(endpoint, options) {
+        const request = await this.request(endpoint, { ...options, method: 'GET' });
+        const requestData = await this.formatData(request, options);
+        return { data: requestData, headers: request.headers, status: request.status };
+    }
+    async head(endpoint, options) {
+        const request = await this.request(endpoint, { ...options, method: 'HEAD' });
+        const requestData = await this.formatData(request, options);
+        return { data: requestData, headers: request.headers, status: request.status };
+    }
+    async patch(endpoint, data, options) {
+        const request = await this.request(endpoint, { ...options, data, method: 'PATCH' });
+        const requestData = await this.formatData(request, options);
+        return { data: requestData, headers: request.headers, status: request.status };
+    }
+    async options(endpoint, options) {
+        const request = await this.request(endpoint, { ...options, method: 'OPTIONS' });
+        const requestData = await this.formatData(request, options);
+        return { data: requestData, headers: request.headers, status: request.status };
+    }
+    async post(endpoint, data, options) {
+        const request = await this.request(endpoint, { data, ...options, method: 'POST' });
+        const requestData = await this.formatData(request, options);
+        return { data: requestData, headers: request.headers, status: request.status };
+    }
+    async put(endpoint, data, options) {
+        const request = await this.request(endpoint, { data, ...options, method: 'PUT' });
+        const requestData = await this.formatData(request, options);
+        return { data: requestData, headers: request.headers, status: request.status };
     }
 }
-exports.APIClient = APIClient;
-//# sourceMappingURL=APIClient.js.map

package/dist/index.d.ts

@@ -1,4 +1,2 @@
-export * from './APIClient';
-export * from './APIException';
-export * from './RequestService';
-export type { AxiosRequestConfig } from 'axios';
+export * from './APIClient.js';
+export * from './types.js';

package/dist/index.js

@@ -1,16 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./APIClient"), exports);
-__exportStar(require("./APIException"), exports);
-__exportStar(require("./RequestService"), exports);
-//# sourceMappingURL=index.js.map
+export * from './APIClient.js';
+export * from './types.js';

package/dist/types.d.ts

@@ -0,0 +1,22 @@
+export interface RequestOptions {
+    data?: any;
+    headers?: HeadersInit;
+    method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS' | 'get' | 'post' | 'put' | 'delete' | 'patch' | 'head' | 'options';
+    params?: object;
+    responseType?: 'arraybuffer' | 'json' | 'text' | 'blob';
+}
+export type ApiClientConfig = Partial<Omit<RequestInit, 'method'>> & {
+    auth?: {
+        password: string;
+        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;
+}

package/dist/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,37 +1,31 @@
 {
-  "author": "Florian Keller <github@floriankeller.de>",
-  "dependencies": {
-    "axios": "0.19.2",
-    "http-status-codes": "1.4.0"
-  },
-  "description": "A generic API client",
+  "author": "Florian Imdahl <git@ffflorian.de>",
+  "description": "Simple API client using fetch",
   "devDependencies": {
-    "@types/node": "~14",
-    "rimraf": "3.0.2",
-    "typedoc": "0.17.7",
-    "typescript": "3.9.5"
+    "rimraf": "6.1.0",
+    "typescript": "5.9.3"
   },
   "engines": {
-    "node": ">= 10.9"
+    "node": ">= 18.0"
   },
+  "exports": "./dist/index.js",
   "files": [
     "dist"
   ],
   "keywords": [
-    "api",
-    "api-client"
+    "cli",
+    "typescript"
   ],
   "license": "GPL-3.0",
-  "main": "dist/index.js",
+  "module": "dist/index.js",
   "name": "@ffflorian/api-client",
-  "repository": "https://github.com/ffflorian/api-clients/tree/master/packages/api-client",
+  "repository": "https://github.com/ffflorian/node-packages/tree/main/packages/api-client",
   "scripts": {
-    "build:ts": "tsc",
-    "build:docs": "typedoc --options ../../typedoc.json --out ../../docs/packages/api-client",
+    "build": "tsc -p tsconfig.build.json",
     "clean": "rimraf dist",
-    "dist": "yarn clean && yarn build:ts",
+    "dist": "yarn clean && yarn build",
     "test": "exit 0"
   },
-  "version": "1.0.13",
-  "gitHead": "06d95dac1c00b3f1ca7789ffad99bd7c269b1ebf"
+  "type": "module",
+  "version": "2.1.0"
 }

package/CHANGELOG.md

@@ -1,250 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [1.0.13](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.12...@ffflorian/api-client@1.0.13) (2020-06-24)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.12](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.11...@ffflorian/api-client@1.0.12) (2020-05-24)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.11](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.10...@ffflorian/api-client@1.0.11) (2020-05-13)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.10](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.9...@ffflorian/api-client@1.0.10) (2020-04-27)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.9](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.8...@ffflorian/api-client@1.0.9) (2020-04-26)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.8](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.7...@ffflorian/api-client@1.0.8) (2020-02-13)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.7](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.6...@ffflorian/api-client@1.0.7) (2020-01-22)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.6](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.5...@ffflorian/api-client@1.0.6) (2020-01-17)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.5](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.4...@ffflorian/api-client@1.0.5) (2020-01-16)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.4](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.3...@ffflorian/api-client@1.0.4) (2020-01-15)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.3](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.2...@ffflorian/api-client@1.0.3) (2019-12-18)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.2](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.1...@ffflorian/api-client@1.0.2) (2019-09-11)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [1.0.1](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@1.0.0...@ffflorian/api-client@1.0.1) (2019-09-01)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-# [1.0.0](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.5.1...@ffflorian/api-client@1.0.0) (2019-07-17)
-
-
-### Features
-
-* Set ES6 as target and require Node >= 10.9 ([#130](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/issues/130)) ([42109dc](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/commit/42109dc))
-
-
-### BREAKING CHANGES
-
-* Node.js >= 10.9 is required.
-
-
-
-
-
-## [0.5.1](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.5.0...@ffflorian/api-client@0.5.1) (2019-07-11)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-# [0.5.0](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.4.4...@ffflorian/api-client@0.5.0) (2019-06-09)
-
-
-### Features
-
-* **updown.io:** Use @ffflorian/api-client ([#98](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/issues/98)) ([a6be424](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/commit/a6be424))
-
-
-
-
-
-## [0.4.4](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.4.3...@ffflorian/api-client@0.4.4) (2019-05-30)
-
-
-### Bug Fixes
-
-* **security:** Upgrade axios to 0.19.0 ([b745299](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/commit/b745299))
-
-
-
-
-
-## [0.4.3](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.4.2...@ffflorian/api-client@0.4.3) (2019-05-14)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [0.4.2](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.4.1...@ffflorian/api-client@0.4.2) (2019-04-11)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [0.4.1](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.4.0...@ffflorian/api-client@0.4.1) (2019-04-11)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-# [0.4.0](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.3.4...@ffflorian/api-client@0.4.0) (2019-04-11)
-
-
-### Features
-
-* **api-client:** Add/remove a requestInjector ([#46](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/issues/46)) ([79b53e0](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/commit/79b53e0))
-
-
-
-
-
-## [0.3.4](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.3.3...@ffflorian/api-client@0.3.4) (2019-04-05)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [0.3.3](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.3.2...@ffflorian/api-client@0.3.3) (2019-04-05)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [0.3.2](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.3.1...@ffflorian/api-client@0.3.2) (2019-04-03)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-## [0.3.1](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.3.0...@ffflorian/api-client@0.3.1) (2019-03-31)
-
-**Note:** Version bump only for package @ffflorian/api-client
-
-
-
-
-
-# [0.3.0](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.2.0...@ffflorian/api-client@0.3.0) (2019-03-27)
-
-
-### Features
-
-* **api-client:** Add ability to send data ([#30](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/issues/30)) ([318830b](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/commit/318830b))
-
-
-
-
-
-# [0.2.0](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/compare/@ffflorian/api-client@0.1.0...@ffflorian/api-client@0.2.0) (2019-03-20)
-
-
-### Features
-
-* **api-client:** Add injector ([#25](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/issues/25)) ([9054d0a](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/commit/9054d0a))
-
-
-
-
-
-# 0.1.0 (2019-03-09)
-
-
-### Features
-
-* Add APIClient ([#5](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/issues/5)) ([2bdb7d2](https://github.com/ffflorian/api-clients/tree/master/packages/api-client/commit/2bdb7d2))

package/dist/APIClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"APIClient.js","sourceRoot":"","sources":["../src/APIClient.ts"],"names":[],"mappings":";;;AAAA,qDAAmE;AAWnE,MAAa,SAAS;IAMpB,YAAY,OAAkC;QAC5C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,GAAG,EAAC,MAAM,EAAE,OAAO,EAAC,CAAC;SAC7B;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAI,OAAO,CAAC,CAAC;IACvD,CAAC;IAED,mCAAmC;IAC5B,qBAAqB;QAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;QACpC,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACI,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,eAAqC;QAC7D,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAC;QAC/C,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC1D,CAAC;CACF;AArCD,8BAqCC"}

package/dist/APIException.d.ts

@@ -1,17 +0,0 @@
-import type { AxiosError } from 'axios';
-export declare class APIException extends Error {
-    constructor(message?: string, serverMessage?: string);
-}
-export declare class AuthenticationError extends Error {
-    constructor(message?: string, serverMessage?: string);
-}
-export declare class InvalidResponseError extends Error {
-    constructor(message?: string);
-}
-export declare class NotFoundError extends Error {
-    constructor(message?: string, serverMessage?: string);
-}
-export declare class RateLimitError extends Error {
-    constructor(message?: string, serverMessage?: string);
-}
-export declare function ExceptionMapper(error: AxiosError): Error;

package/dist/APIException.js

@@ -1,66 +0,0 @@
-"use strict";
-/* eslint-disable prefer-template */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExceptionMapper = exports.RateLimitError = exports.NotFoundError = exports.InvalidResponseError = exports.AuthenticationError = exports.APIException = void 0;
-const HTTP_STATUS = require("http-status-codes");
-class APIException extends Error {
-    constructor(message = '', serverMessage) {
-        super(message);
-        this.message += serverMessage ? `. ("${serverMessage}")` : '. The server did not provide any further information.';
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
-}
-exports.APIException = APIException;
-class AuthenticationError extends Error {
-    constructor(message = '', serverMessage) {
-        super(message);
-        this.message += '. Wrong API key?' + (serverMessage ? ` ("${serverMessage}")` : '');
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
-}
-exports.AuthenticationError = AuthenticationError;
-class InvalidResponseError extends Error {
-    constructor(message = '') {
-        super(message);
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
-}
-exports.InvalidResponseError = InvalidResponseError;
-class NotFoundError extends Error {
-    constructor(message = '', serverMessage) {
-        super(message);
-        this.message += serverMessage ? `: "${serverMessage}".` : '. The server did not provide any further information.';
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
-}
-exports.NotFoundError = NotFoundError;
-class RateLimitError extends Error {
-    constructor(message = '', serverMessage) {
-        super(message);
-        this.message += ': Rate limit hit.' + (serverMessage ? ` ("${serverMessage}")` : '');
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
-}
-exports.RateLimitError = RateLimitError;
-function ExceptionMapper(error) {
-    var _a, _b;
-    if ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) {
-        const serverMessage = ((_b = error.response.data) === null || _b === void 0 ? void 0 : _b.message) || undefined;
-        switch (error.response.status) {
-            case HTTP_STATUS.FORBIDDEN:
-                return new AuthenticationError(error.message, serverMessage);
-            case HTTP_STATUS.NOT_FOUND:
-                return new NotFoundError(error.message, serverMessage);
-            case HTTP_STATUS.TOO_MANY_REQUESTS:
-                return new RateLimitError(error.message, serverMessage);
-            default:
-                return new APIException(error.message, serverMessage);
-        }
-    }
-    if (error instanceof InvalidResponseError) {
-        return error;
-    }
-    return new Error(error.message);
-}
-exports.ExceptionMapper = ExceptionMapper;
-//# sourceMappingURL=APIException.js.map

package/dist/APIException.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"APIException.js","sourceRoot":"","sources":["../src/APIException.ts"],"names":[],"mappings":"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"}

package/dist/RequestService.d.ts

@@ -1,25 +0,0 @@
-import { AxiosRequestConfig, AxiosResponse } from 'axios';
-import type { ClientOptions } from './APIClient';
-export declare type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
-export declare type AxiosResponseWithoutData<T> = Omit<AxiosResponse<unknown>, 'data'> & T;
-export interface AxiosConfigWithData<T> extends AxiosRequestConfig {
-    data?: T;
-}
-export declare type RequestInjectorFn<T> = (baseConfig: AxiosConfigWithData<T>) => AxiosConfigWithData<T> | Promise<AxiosConfigWithData<T>>;
-export declare type ResponseInjectorFn<T> = (response: AxiosResponseWithoutData<T>) => AxiosResponseWithoutData<T> | Promise<AxiosResponseWithoutData<T>>;
-export declare class RequestService<T> {
-    private readonly config;
-    constructor(config: ClientOptions<T>);
-    delete<U>(url: string, options?: AxiosConfigWithData<T>): Promise<U>;
-    get<U>(url: string, options?: AxiosConfigWithData<T>): Promise<U>;
-    head<U>(url: string, options?: AxiosConfigWithData<T>): Promise<U>;
-    options<U>(url: string, options?: AxiosConfigWithData<T>): Promise<U>;
-    patch<U>(url: string, options?: AxiosConfigWithData<T>): Promise<U>;
-    post<U>(url: string, options?: AxiosConfigWithData<T>): Promise<U>;
-    put<U>(url: string, options?: AxiosConfigWithData<T>): Promise<U>;
-    removeRequestInjector(): void;
-    request<U>(config: AxiosConfigWithData<T>): Promise<AxiosResponse<U>>;
-    setApiUrl(apiUrl: string): void;
-    setRequestInjector(requestInjector: RequestInjectorFn<T>): void;
-    private injectConfig;
-}

package/dist/RequestService.js

@@ -1,142 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestService = void 0;
-const axios_1 = require("axios");
-const HTTP_STATUS = require("http-status-codes");
-const APIException_1 = require("./APIException");
-var HttpMethod;
-(function (HttpMethod) {
-    HttpMethod["DELETE"] = "delete";
-    HttpMethod["GET"] = "get";
-    HttpMethod["HEAD"] = "head";
-    HttpMethod["OPTIONS"] = "options";
-    HttpMethod["PATCH"] = "patch";
-    HttpMethod["POST"] = "post";
-    HttpMethod["PUT"] = "put";
-})(HttpMethod || (HttpMethod = {}));
-class RequestService {
-    constructor(config) {
-        this.config = config;
-    }
-    delete(url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = yield this.injectConfig({
-                method: HttpMethod.DELETE,
-                url: `${this.config.apiUrl}${url}`,
-            }, options);
-            const response = yield this.request(config);
-            return response.data;
-        });
-    }
-    get(url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = yield this.injectConfig({
-                method: HttpMethod.GET,
-                url: `${this.config.apiUrl}${url}`,
-            }, options);
-            const response = yield this.request(config);
-            return response.data;
-        });
-    }
-    head(url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = yield this.injectConfig({
-                method: HttpMethod.HEAD,
-                url: `${this.config.apiUrl}${url}`,
-            }, options);
-            const response = yield this.request(config);
-            return response.data;
-        });
-    }
-    options(url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = yield this.injectConfig({
-                method: HttpMethod.OPTIONS,
-                url: `${this.config.apiUrl}${url}`,
-            }, options);
-            const response = yield this.request(config);
-            return response.data;
-        });
-    }
-    patch(url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = yield this.injectConfig({
-                method: HttpMethod.PATCH,
-                url: `${this.config.apiUrl}${url}`,
-            }, options);
-            const response = yield this.request(config);
-            return response.data;
-        });
-    }
-    post(url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = yield this.injectConfig({
-                method: HttpMethod.POST,
-                url: `${this.config.apiUrl}${url}`,
-            }, options);
-            const response = yield this.request(config);
-            return response.data;
-        });
-    }
-    put(url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = yield this.injectConfig({
-                method: HttpMethod.PUT,
-                url: `${this.config.apiUrl}${url}`,
-            }, options);
-            const response = yield this.request(config);
-            return response.data;
-        });
-    }
-    removeRequestInjector() {
-        delete this.config.requestInjector;
-    }
-    request(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const response = yield axios_1.default.request(config);
-                const contentType = response.headers['content-type'] ? String(response.headers['content-type']) : undefined;
-                if (contentType) {
-                    if (contentType.includes('application/json') || config.responseType) {
-                        return response;
-                    }
-                    throw new APIException_1.InvalidResponseError('The server responded with invalid data: No JSON sent.');
-                }
-                else if (response.status === HTTP_STATUS.NO_CONTENT) {
-                    return response;
-                }
-                else {
-                    throw new APIException_1.InvalidResponseError('The server responded with invalid data: No Content-Type set.');
-                }
-            }
-            catch (error) {
-                throw APIException_1.ExceptionMapper(error);
-            }
-        });
-    }
-    setApiUrl(apiUrl) {
-        this.config.apiUrl = apiUrl;
-    }
-    setRequestInjector(requestInjector) {
-        this.config.requestInjector = requestInjector;
-    }
-    injectConfig(baseConfig, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (typeof this.config.requestInjector === 'function') {
-                baseConfig = yield this.config.requestInjector(baseConfig);
-            }
-            return Object.assign(Object.assign({}, baseConfig), options);
-        });
-    }
-}
-exports.RequestService = RequestService;
-//# sourceMappingURL=RequestService.js.map

package/dist/RequestService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RequestService.js","sourceRoot":"","sources":["../src/RequestService.ts"],"names":[],"mappings":"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"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4B;AAC5B,iDAA+B;AAC/B,mDAAiC"}