@aeriajs/common 0.0.145 → 0.0.146

package/dist/http.d.ts

@@ -3,21 +3,18 @@ export type RequestParams = Omit<RequestInit, 'headers'> & {
 };
 export type RequestConfig = {
     params?: RequestParams;
-    requestTransformer?: (...args: Parameters<typeof defaultRequestTransformer>) => Promise<{
-        url: string;
-        params: RequestParams;
-    }>;
-    responseTransformer?: typeof defaultResponseTransformer;
+    requestTransformer?: RequestTransformer;
+    responseTransformer?: ResponseTransformer;
 };
-export declare const defaultRequestTransformer: (url: string, payload: unknown, params: RequestParams) => Promise<{
+type OmitLastParameter<TFunction> = TFunction extends (...args: [...infer Tail, infer _Head]) => infer Return ? (...args: Tail) => Return : never;
+export type RequestTransformer = (url: string, payload: unknown, params: RequestParams, next: (url: string, payload: unknown, params: RequestParams) => ReturnType<RequestTransformer>) => Promise<{
     url: string;
     params: RequestParams;
 }>;
-export declare const defaultResponseTransformer: (response: Awaited<ReturnType<typeof fetch>>) => Promise<Response & {
-    data: unknown;
-}>;
+export type ResponseTransformer = (response: Awaited<ReturnType<typeof fetch>>, next: (response: Awaited<ReturnType<typeof fetch>>) => ReturnType<ResponseTransformer>) => Promise<Awaited<ReturnType<typeof fetch>>>;
+export declare const defaultRequestTransformer: OmitLastParameter<RequestTransformer>;
+export declare const defaultResponseTransformer: OmitLastParameter<ResponseTransformer>;
 export declare const request: <TResponseType = unknown>(url: string, payload?: unknown, config?: RequestConfig) => Promise<Response & {
-    data: unknown;
-} & {
     data: TResponseType;
 }>;
+export {};

package/dist/http.js

@@ -29,19 +29,29 @@ const defaultResponseTransformer = async (response) => {
 };
 exports.defaultResponseTransformer = defaultResponseTransformer;
 const request = async (url, payload, config = {}) => {
-    const { requestTransformer = exports.defaultRequestTransformer, responseTransformer = exports.defaultResponseTransformer, params = {
-        method: payload
-            ? 'POST'
-            : 'GET',
-        headers: payload
-            ? {
-                'content-type': 'application/json',
-            }
-            : {},
-    }, } = config;
-    const transformedRequest = await requestTransformer(url, payload, params);
+    const { requestTransformer = (url, payload, params, next) => next(url, payload, params), responseTransformer = (response, next) => next(response), } = config;
+    let params;
+    if (config.params) {
+        params = config.params;
+    }
+    else {
+        if (payload) {
+            params = {
+                method: 'POST',
+                headers: {
+                    'content-type': 'application/json',
+                },
+            };
+        }
+        else {
+            params = {
+                method: 'GET',
+            };
+        }
+    }
+    const transformedRequest = await requestTransformer(url, payload, params, exports.defaultRequestTransformer);
     const response = await fetch(transformedRequest.url, transformedRequest.params);
-    const transformedResponse = await responseTransformer(response);
+    const transformedResponse = await responseTransformer(response, exports.defaultResponseTransformer);
     return transformedResponse;
 };
 exports.request = request;

package/dist/http.mjs

@@ -23,17 +23,28 @@ export const defaultResponseTransformer = async (response) => {
 };
 export const request = async (url, payload, config = {}) => {
   const {
-    requestTransformer = defaultRequestTransformer,
-    responseTransformer = defaultResponseTransformer,
-    params = {
-      method: payload ? "POST" : "GET",
-      headers: payload ? {
-        "content-type": "application/json"
-      } : {}
-    }
+    requestTransformer = (url2, payload2, params2, next) => next(url2, payload2, params2),
+    responseTransformer = (response2, next) => next(response2)
   } = config;
-  const transformedRequest = await requestTransformer(url, payload, params);
+  let params;
+  if (config.params) {
+    params = config.params;
+  } else {
+    if (payload) {
+      params = {
+        method: "POST",
+        headers: {
+          "content-type": "application/json"
+        }
+      };
+    } else {
+      params = {
+        method: "GET"
+      };
+    }
+  }
+  const transformedRequest = await requestTransformer(url, payload, params, defaultRequestTransformer);
   const response = await fetch(transformedRequest.url, transformedRequest.params);
-  const transformedResponse = await responseTransformer(response);
+  const transformedResponse = await responseTransformer(response, defaultResponseTransformer);
   return transformedResponse;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/common",
-  "version": "0.0.145",
+  "version": "0.0.146",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",