@bzbs/react-api-client 0.0.20 → 0.0.21

package/dist/index.d.mts

@@ -10,10 +10,23 @@ interface BzbsErrorResponse {
     };
 }
 
-type ServiceResponse<T> = {
-    model: T | undefined;
-    response: AxiosResponse | undefined;
-    error: any | undefined | BzbsErrorResponse;
+type ServiceResponse<T> = SuccessResponse<T> | ErrorResponse;
+type SuccessResponse<T> = {
+    type: 'success';
+    model: T;
+    response: AxiosResponse;
+};
+type ErrorResponse = ClientError | ServerError;
+type ClientError = {
+    type: 'client-error';
+    message: string;
+    details?: any;
+};
+type ServerError = {
+    type: 'server-error';
+    error: BzbsErrorResponse;
+    statusCode: number;
+    response: AxiosResponse;
 };
 type RequestOptions = {
     headers?: {
@@ -22,21 +35,22 @@ type RequestOptions = {
     params?: {
         [key: string]: string;
     };
-    data?: {
-        [key: string]: string;
-    } | any;
+    data?: any;
     baseUrl?: string;
 };
 declare class BaseService {
-    client: AxiosInstance;
-    baseUrl: string;
+    private client;
+    private baseUrl;
     constructor(client: AxiosInstance, baseUrl: string);
+    private normalizeError;
+    private request;
     get<T>(path: string, params?: any, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
     post<T>(path: string, data: any, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
     put<T>(path: string, data: any, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
     delete<T>(path: string, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
     patch<T>(path: string, data: any, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
-    joinUrl(baseUrl: string, path: string): string;
+    private joinUrl;
+    private getHeaders;
 }
 
 interface LoginResponse {

package/dist/index.d.ts

@@ -10,10 +10,23 @@ interface BzbsErrorResponse {
     };
 }
 
-type ServiceResponse<T> = {
-    model: T | undefined;
-    response: AxiosResponse | undefined;
-    error: any | undefined | BzbsErrorResponse;
+type ServiceResponse<T> = SuccessResponse<T> | ErrorResponse;
+type SuccessResponse<T> = {
+    type: 'success';
+    model: T;
+    response: AxiosResponse;
+};
+type ErrorResponse = ClientError | ServerError;
+type ClientError = {
+    type: 'client-error';
+    message: string;
+    details?: any;
+};
+type ServerError = {
+    type: 'server-error';
+    error: BzbsErrorResponse;
+    statusCode: number;
+    response: AxiosResponse;
 };
 type RequestOptions = {
     headers?: {
@@ -22,21 +35,22 @@ type RequestOptions = {
     params?: {
         [key: string]: string;
     };
-    data?: {
-        [key: string]: string;
-    } | any;
+    data?: any;
     baseUrl?: string;
 };
 declare class BaseService {
-    client: AxiosInstance;
-    baseUrl: string;
+    private client;
+    private baseUrl;
     constructor(client: AxiosInstance, baseUrl: string);
+    private normalizeError;
+    private request;
     get<T>(path: string, params?: any, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
     post<T>(path: string, data: any, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
     put<T>(path: string, data: any, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
     delete<T>(path: string, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
     patch<T>(path: string, data: any, requestOptions?: RequestOptions): Promise<ServiceResponse<T>>;
-    joinUrl(baseUrl: string, path: string): string;
+    private joinUrl;
+    private getHeaders;
 }
 
 interface LoginResponse {

package/dist/index.js

@@ -1,6 +1,8 @@
 "use strict";
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -17,6 +19,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -62,133 +65,77 @@ module.exports = __toCommonJS(src_exports);
 // src/api/base-service.ts
 var BaseService = class {
   constructor(client, baseUrl) {
+    if (!client)
+      throw new Error("Axios client is required.");
+    if (!baseUrl)
+      throw new Error("Base URL is required.");
     this.client = client;
     this.baseUrl = baseUrl;
-    if (!this.baseUrl) {
-      throw "Please check base_URL";
-    }
-    if (!this.client) {
-      throw "Please check client";
+  }
+  normalizeError(error) {
+    if (error.response && error.response.data) {
+      return {
+        type: "server-error",
+        error: error.response.data,
+        statusCode: error.response.status,
+        response: error.response
+      };
     }
+    return {
+      type: "client-error",
+      message: error.message || "An unexpected error occurred.",
+      details: error
+    };
   }
-  get(path, params, requestOptions) {
+  request(method, path, data, requestOptions) {
     return __async(this, null, function* () {
-      var _a, _b;
+      var _a;
       try {
-        const response = yield this.client.get(this.joinUrl((_a = requestOptions == null ? void 0 : requestOptions.baseUrl) != null ? _a : this.baseUrl, path), {
-          params: __spreadValues(__spreadValues({}, params ? params : {}), (requestOptions == null ? void 0 : requestOptions.params) ? requestOptions.params : {}),
-          headers: requestOptions == null ? void 0 : requestOptions.headers,
-          data: requestOptions == null ? void 0 : requestOptions.data
-        });
-        return {
-          model: response == null ? void 0 : response.data,
-          response,
-          error: void 0
+        const url = this.joinUrl((_a = requestOptions == null ? void 0 : requestOptions.baseUrl) != null ? _a : this.baseUrl, path);
+        const config = {
+          params: requestOptions == null ? void 0 : requestOptions.params,
+          headers: this.getHeaders(requestOptions == null ? void 0 : requestOptions.headers),
+          data
         };
+        const response = yield this.client.request(__spreadValues({ method, url }, config));
+        return { model: response.data, response, type: "success" };
       } catch (error) {
-        return {
-          model: void 0,
-          response: void 0,
-          error: error.response ? error.response.data : (_b = error.response) != null ? _b : error
-        };
+        return this.normalizeError(error);
       }
     });
   }
+  get(path, params, requestOptions) {
+    return __async(this, null, function* () {
+      return this.request("get", path, void 0, __spreadProps(__spreadValues({}, requestOptions), { params }));
+    });
+  }
   post(path, data, requestOptions) {
     return __async(this, null, function* () {
-      var _a, _b;
-      try {
-        const response = yield this.client.post(
-          this.joinUrl((_a = requestOptions == null ? void 0 : requestOptions.baseUrl) != null ? _a : this.baseUrl, path),
-          data,
-          requestOptions
-        );
-        return {
-          model: response == null ? void 0 : response.data,
-          response,
-          error: void 0
-        };
-      } catch (error) {
-        return {
-          model: void 0,
-          response: void 0,
-          error: error.response ? error.response.data : (_b = error.response) != null ? _b : error
-        };
-      }
+      return this.request("post", path, data, requestOptions);
     });
   }
   put(path, data, requestOptions) {
     return __async(this, null, function* () {
-      var _a, _b;
-      try {
-        const response = yield this.client.put(
-          this.joinUrl((_a = requestOptions == null ? void 0 : requestOptions.baseUrl) != null ? _a : this.baseUrl, path),
-          data,
-          requestOptions
-        );
-        return {
-          model: response == null ? void 0 : response.data,
-          response,
-          error: void 0
-        };
-      } catch (error) {
-        return {
-          model: void 0,
-          response: void 0,
-          error: error.response ? error.response.data : (_b = error.response) != null ? _b : error
-        };
-      }
+      return this.request("put", path, data, requestOptions);
     });
   }
   delete(path, requestOptions) {
     return __async(this, null, function* () {
-      var _a, _b;
-      try {
-        const response = yield this.client.delete(
-          this.joinUrl((_a = requestOptions == null ? void 0 : requestOptions.baseUrl) != null ? _a : this.baseUrl, path),
-          requestOptions
-        );
-        return {
-          model: response == null ? void 0 : response.data,
-          response,
-          error: void 0
-        };
-      } catch (error) {
-        return {
-          model: void 0,
-          response: void 0,
-          error: error.response ? error.response.data : (_b = error.response) != null ? _b : error
-        };
-      }
+      return this.request("delete", path, void 0, requestOptions);
     });
   }
   patch(path, data, requestOptions) {
     return __async(this, null, function* () {
-      var _a, _b;
-      try {
-        const response = yield this.client.patch(
-          this.joinUrl((_a = requestOptions == null ? void 0 : requestOptions.baseUrl) != null ? _a : this.baseUrl, path),
-          data,
-          requestOptions
-        );
-        return {
-          model: response == null ? void 0 : response.data,
-          response,
-          error: void 0
-        };
-      } catch (error) {
-        return {
-          model: void 0,
-          response: void 0,
-          error: error.response ? error.response.data : (_b = error.response) != null ? _b : error
-        };
-      }
+      return this.request("patch", path, data, requestOptions);
     });
   }
   joinUrl(baseUrl, path) {
-    baseUrl = baseUrl.endsWith("/") ? baseUrl : baseUrl + "/";
-    const url = new URL(path, baseUrl);
-    return url.toString();
+    return new URL(path, baseUrl).toString();
+  }
+  getHeaders(customHeaders) {
+    return __spreadValues({
+      "Content-Type": "application/json"
+    }, customHeaders);
   }
 };
 
@@ -888,7 +835,7 @@ var CartApi = class extends BaseService {
    */
   cartCount(requestOptions) {
     return __async(this, null, function* () {
-      return yield this.get(this.baseUrl + "cart/count", {}, requestOptions);
+      return yield this.get("cart/count", {}, requestOptions);
     });
   }
   /**