Merge pull request #42 from AckeeCZ/feat/antonio-core

Feat/antonio core

Author: cermakjiri

packages/@ackee/antonio-core/package.json

@@ -28,18 +28,18 @@
     "scripts": {
         "size": "package-size es --no-cache"
     },
+    "dependencies": {
+        "fetch-headers": "^2.0.0"
+    },
+    "devDependencies": {
+        "@types/fetch-headers": "^2.0.0"
+    },
     "bugs": {
         "url": "https://github.com/AckeeCZ/antonio/issues"
     },
     "engines": {
         "node": ">=12"
     },
     "author": "Jiří Čermák <[email protected]>",
-    "license": "MIT",
-    "dependencies": {
-        "fetch-headers": "^2.0.0"
-    },
-    "devDependencies": {
-        "@types/fetch-headers": "^2.0.0"
-    }
+    "license": "MIT"
 }

packages/@ackee/antonio-core/src/modules/core/request.ts

@@ -1,4 +1,4 @@
-import { RequestMethod, RequestConfig, GeneralConfig } from 'types';
+import { RequestMethod, RequestConfig, GeneralConfig, RequestResult } from 'types';
 
 import { interceptors } from './models/InterceptorManager';
 import type { RequestInterceptorsEntries, ResponseInterceptorsEntries } from './models/InterceptorManager';
@@ -106,7 +106,23 @@ export default function* request(
     const request = yield applyRequestInteceptors(requestInterceptors, url, requestInit);
 
     const responseInterceptors: ResponseInterceptorsEntries = interceptors.get(antonio.interceptors.response);
-    const { response, data } = yield applyResponseInterceptors(responseInterceptors, request, config);
+    const {
+        response,
+        data,
+    }: {
+        response: Response;
+        data: BodyInit | null;
+    } = yield applyResponseInterceptors(responseInterceptors, request, config);
 
-    return { request, response, data };
+    const result: RequestResult = {
+        request,
+        response,
+        data,
+        status: response.status,
+        statusText: response.statusText,
+        config,
+        headers: Object.fromEntries(response.headers.entries()),
+    };
+
+    return result;
 }

packages/@ackee/antonio-core/src/modules/core/utils/request.ts

@@ -49,13 +49,20 @@ function setUriParams(templateUrl: string, uriParams: RequestUriParams): string
     return templateUrl.split('/').map(templateToValue).join('/');
 }
 
+const removeSlashAsLastChar = (chunk: string) => chunk.replace(/\/$/, '');
+
+function joinUrlChunks(baseUrl?: string, ...path: string[]) {
+    const joinedUrl = [baseUrl, ...path].filter(Boolean).map(removeSlashAsLastChar).join('/');
+    return new URL(joinedUrl);
+}
+
 function createRequestUrl(requestUrl: string, requestConfig: RequestConfig, generalConfig: GeneralConfig): string {
     try {
         if (requestConfig.uriParams) {
             requestUrl = setUriParams(requestUrl, requestConfig.uriParams);
         }
 
-        const url = new URL(requestUrl, requestConfig.baseURL);
+        const url = joinUrlChunks(requestConfig.baseURL, requestUrl);
 
         url.search = mergeUrlSearchParams(
             new URLSearchParams(url.search),

packages/@ackee/antonio-core/src/types.ts

@@ -52,4 +52,24 @@ export interface RequestResult {
     request: Request;
     response: Response;
     data: BodyInit | null;
+
+    /**
+     * @deprecated This prop is going to be removed in next major relase. Use `response.status` instead.
+     */
+    status: number;
+
+    /**
+     * @deprecated This prop is going to be removed in next major relase. Use `response.statusText` instead.
+     */
+    statusText: string;
+
+    /**
+     * @deprecated This prop is going to be removed in next major relase. Use `response.headers` instead.
+     */
+    headers: {};
+
+    /**
+     * @deprecated This prop is going to be removed in next major relase. Depend on properties in the `request`.
+     */
+    config: {};
 }