@aeriajs/common 0.0.145 → 0.0.147

package/dist/http.d.ts

@@ -3,21 +3,23 @@ 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;
+type RequestTransformerContext = {
     url: string;
+    payload: unknown;
     params: RequestParams;
-}>;
-export declare const defaultResponseTransformer: (response: Awaited<ReturnType<typeof fetch>>) => Promise<Response & {
-    data: unknown;
-}>;
-export declare const request: <TResponseType = unknown>(url: string, payload?: unknown, config?: RequestConfig) => Promise<Response & {
-    data: unknown;
-} & {
+};
+type ResponseTransformerContext = {
+    response: Awaited<ReturnType<typeof fetch>>;
+};
+export type RequestTransformer = (context: RequestTransformerContext, next: (context: RequestTransformerContext) => ReturnType<RequestTransformer>) => Promise<RequestTransformerContext>;
+export type ResponseTransformer = (context: ResponseTransformerContext, next: (context: ResponseTransformerContext) => ReturnType<ResponseTransformer>) => Promise<ResponseTransformerContext>;
+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<ResponseTransformerContext & {
     data: TResponseType;
 }>;
+export {};

package/dist/http.js

@@ -1,47 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = exports.defaultResponseTransformer = exports.defaultRequestTransformer = void 0;
-const defaultRequestTransformer = async (url, payload, params) => {
-    const request = {
-        url,
-        params,
-    };
-    if (payload) {
-        if (params.method === 'GET' || params.method === 'HEAD') {
-            request.url += `?${new URLSearchParams(payload)}`;
+const defaultRequestTransformer = async (context) => {
+    if (context.payload) {
+        if (context.params.method === 'GET' || context.params.method === 'HEAD') {
+            context.url += `?${new URLSearchParams(context.payload)}`;
         }
         else {
-            request.params.body = params.headers?.['content-type']?.startsWith('application/json')
-                ? JSON.stringify(payload)
-                : payload;
+            context.params.body = context.params.headers?.['content-type']?.startsWith('application/json')
+                ? JSON.stringify(context.payload)
+                : context.payload;
         }
     }
-    return request;
+    return context;
 };
 exports.defaultRequestTransformer = defaultRequestTransformer;
-const defaultResponseTransformer = async (response) => {
-    const result = response;
-    result.data = await response.text();
-    if (response.headers.get('content-type')?.startsWith('application/json')) {
+const defaultResponseTransformer = async (context) => {
+    const result = context.response;
+    result.data = await context.response.text();
+    if (context.response.headers.get('content-type')?.startsWith('application/json')) {
         result.data = JSON.parse(String(result.data));
     }
-    return result;
+    context.response = result;
+    return context;
 };
 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 = (context, next) => next(context), responseTransformer = (context, next) => next(context), } = 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

@@ -1,39 +1,53 @@
 "use strict";
-export const defaultRequestTransformer = async (url, payload, params) => {
-  const request2 = {
-    url,
-    params
-  };
-  if (payload) {
-    if (params.method === "GET" || params.method === "HEAD") {
-      request2.url += `?${new URLSearchParams(payload)}`;
+export const defaultRequestTransformer = async (context) => {
+  if (context.payload) {
+    if (context.params.method === "GET" || context.params.method === "HEAD") {
+      context.url += `?${new URLSearchParams(context.payload)}`;
     } else {
-      request2.params.body = params.headers?.["content-type"]?.startsWith("application/json") ? JSON.stringify(payload) : payload;
+      context.params.body = context.params.headers?.["content-type"]?.startsWith("application/json") ? JSON.stringify(context.payload) : context.payload;
     }
   }
-  return request2;
+  return context;
 };
-export const defaultResponseTransformer = async (response) => {
-  const result = response;
-  result.data = await response.text();
-  if (response.headers.get("content-type")?.startsWith("application/json")) {
+export const defaultResponseTransformer = async (context) => {
+  const result = context.response;
+  result.data = await context.response.text();
+  if (context.response.headers.get("content-type")?.startsWith("application/json")) {
     result.data = JSON.parse(String(result.data));
   }
-  return result;
+  context.response = result;
+  return context;
 };
 export const request = async (url, payload, config = {}) => {
   const {
-    requestTransformer = defaultRequestTransformer,
-    responseTransformer = defaultResponseTransformer,
-    params = {
-      method: payload ? "POST" : "GET",
-      headers: payload ? {
-        "content-type": "application/json"
-      } : {}
-    }
+    requestTransformer = (context, next) => next(context),
+    responseTransformer = (context, next) => next(context)
   } = 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.147",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",