akanjs 2.2.2 → 2.2.3-rc.0

package/fetch/client/fetchClient.ts

@@ -142,8 +142,12 @@ export class FetchClient {
           const argMap = new Map(serializerMap.entries().map(([key, serializer], idx) => [key, serializer(args[idx])]));
           const url = FetchClient.makeHttpUrl(key, endpoint, prefix, argMap);
           const headers = this.#makeAuthHeaders(option);
-          const cacheKey = FetchClient.#makeRequestQueryCacheKey(this.origin, url, headers);
-          const response = await memoizeRequestQuery(cacheKey, () => this.http.get(url, { headers }));
+          const baseUrl = option?.url;
+
+          const requestQuery = () => this.http.get(url, { headers, baseUrl });
+          const response = baseUrl
+            ? await requestQuery()
+            : await memoizeRequestQuery(FetchClient.#makeRequestQueryCacheKey(this.origin, url, headers), requestQuery);
           const parsedReturn = parseReturn(FetchClient.#deepCopy(response), { crystalize: option?.crystalize ?? true });
           return parsedReturn;
         };
@@ -158,6 +162,7 @@ export class FetchClient {
           const body = HttpClient.makeBody(bodyArgs, uploadArgs, argMap);
           const response = await this.http.post(url, body, {
             headers: this.#makeAuthHeaders(option),
+            baseUrl: option?.url,
           });
           const parsedReturn = parseReturn(response, { crystalize: option?.crystalize ?? true });
           return parsedReturn;

package/fetch/client/httpClient.ts

@@ -24,6 +24,7 @@ export interface ErrorConstructor {
 
 interface FetchOptions {
   headers?: Record<string, string>;
+  baseUrl?: string;
 }
 
 export class HttpClient {
@@ -38,8 +39,11 @@ export class HttpClient {
   setErrorConstructor(ErrorCls?: ErrorConstructor) {
     this.ErrorCls = ErrorCls;
   }
+  #resolveBaseUrl(baseUrl?: string) {
+    return (baseUrl ?? this.baseUrl).replace(/\/$/, "");
+  }
   async get<Returns = unknown>(url: string, options: FetchOptions = {}): Promise<Returns> {
-    const res = await fetch(`${this.baseUrl}${url}`, {
+    const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
       headers: { "Content-Type": "application/json", ...options.headers },
     });
     return await this.#readJsonResponse<Returns>(res);
@@ -55,7 +59,7 @@ export class HttpClient {
     options: FetchOptions = {},
   ): Promise<Returns> {
     const { body, headers } = this.#makeReqContent(data);
-    const res = await fetch(`${this.baseUrl}${url}`, {
+    const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
       method: "PUT",
       body,
       headers: { ...headers, ...options.headers },
@@ -68,7 +72,7 @@ export class HttpClient {
     options: FetchOptions = {},
   ): Promise<Returns> {
     const { body, headers } = this.#makeReqContent(data);
-    const res = await fetch(`${this.baseUrl}${url}`, {
+    const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
       method: "POST",
       body,
       headers: { ...headers, ...options.headers },
@@ -76,7 +80,7 @@ export class HttpClient {
     return await this.#readJsonResponse<Returns>(res);
   }
   async delete<Returns = unknown>(url: string, options: FetchOptions = {}): Promise<Returns> {
-    const res = await fetch(`${this.baseUrl}${url}`, {
+    const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
       method: "DELETE",
       headers: { "Content-Type": "application/json", ...options.headers },
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.2.2",
+  "version": "2.2.3-rc.0",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/fetch/client/httpClient.d.ts

@@ -20,6 +20,7 @@ export interface ErrorConstructor {
 }
 interface FetchOptions {
     headers?: Record<string, string>;
+    baseUrl?: string;
 }
 export declare class HttpClient {
     #private;