@iamnnort/request 1.9.2 → 1.10.1

package/dist/index.mjs

@@ -1,40 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __await = function(promise, isYieldStar) {
-  this[0] = promise;
-  this[1] = isYieldStar;
-};
-var __asyncGenerator = (__this, __arguments, generator) => {
-  var resume = (k, v, yes, no) => {
-    try {
-      var x = generator[k](v), isAwait = (v = x.value) instanceof __await, done = x.done;
-      Promise.resolve(isAwait ? v[0] : v).then((y) => isAwait ? resume(k === "return" ? k : "next", v[1] ? { done: y.done, value: y.value } : y, yes, no) : yes({ value: y, done })).catch((e) => resume("throw", e, yes, no));
-    } catch (e) {
-      no(e);
-    }
-  };
-  var method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no));
-  var it = {};
-  return generator = generator.apply(__this, __arguments), it[Symbol.asyncIterator] = () => it, method("next"), method("throw"), method("return"), it;
-};
-
 // src/builder.ts
 import { stringify } from "qs";
 
@@ -62,39 +25,50 @@ var HttpStatuses = /* @__PURE__ */ ((HttpStatuses2) => {
 
 // src/builder.ts
 var RequestBuilder = class {
+  baseConfig;
+  requestConfig;
+  config;
   constructor(params) {
     this.baseConfig = params.baseConfig;
     this.requestConfig = params.requestConfig;
     this.config = {
-      headers: __spreadValues(__spreadValues({
+      headers: {
         Accept: "application/json",
-        "Content-Type": "application/json"
-      }, params.baseConfig.headers), params.requestConfig.headers)
+        "Content-Type": "application/json",
+        ...params.baseConfig.headers,
+        ...params.requestConfig.headers
+      }
     };
   }
   makeContentType() {
     if (this.requestConfig.multipart) {
-      this.config = __spreadProps(__spreadValues({}, this.config), {
-        headers: __spreadProps(__spreadValues({}, this.config.headers), {
+      this.config = {
+        ...this.config,
+        headers: {
+          ...this.config.headers,
           "Content-Type": "multipart/form-data"
-        })
-      });
+        }
+      };
       return this;
     }
     if (this.requestConfig.urlencoded) {
-      this.config = __spreadProps(__spreadValues({}, this.config), {
-        headers: __spreadProps(__spreadValues({}, this.config.headers), {
+      this.config = {
+        ...this.config,
+        headers: {
+          ...this.config.headers,
           "Content-Type": "application/x-www-form-urlencoded"
-        })
-      });
+        }
+      };
       return this;
     }
     if (this.requestConfig.xml) {
-      this.config = __spreadProps(__spreadValues({}, this.config), {
-        headers: __spreadProps(__spreadValues({}, this.config.headers), {
+      this.config = {
+        ...this.config,
+        headers: {
+          ...this.config.headers,
           "Content-Type": "text/xml"
-        })
-      });
+        }
+      };
       return this;
     }
     return this;
@@ -102,27 +76,32 @@ var RequestBuilder = class {
   makeAuth() {
     const auth = this.requestConfig.auth || this.baseConfig.auth;
     if (auth) {
-      this.config = __spreadProps(__spreadValues({}, this.config), {
+      this.config = {
+        ...this.config,
         auth
-      });
+      };
       return this;
     }
     const bearerToken = this.requestConfig.bearerToken || this.baseConfig.bearerToken;
     if (bearerToken) {
-      this.config = __spreadProps(__spreadValues({}, this.config), {
-        headers: __spreadProps(__spreadValues({}, this.config.headers), {
+      this.config = {
+        ...this.config,
+        headers: {
+          ...this.config.headers,
           Authorization: `Bearer ${bearerToken}`
-        })
-      });
+        }
+      };
       return this;
     }
     const apiKey = this.requestConfig.apiKey || this.baseConfig.apiKey;
     if (apiKey) {
-      this.config = __spreadProps(__spreadValues({}, this.config), {
-        headers: __spreadProps(__spreadValues({}, this.config.headers), {
+      this.config = {
+        ...this.config,
+        headers: {
+          ...this.config.headers,
           "x-api-key": apiKey
-        })
-      });
+        }
+      };
       return this;
     }
     return this;
@@ -137,24 +116,24 @@ var RequestBuilder = class {
       this.requestConfig.baseUrl,
       this.requestConfig.url,
       ...this.requestConfig.urlParts || []
-    ].map((urlPart) => urlPart == null ? void 0 : urlPart.toString());
-    const isSecureProtocol = urlParts.some(
-      (urlPart) => urlPart == null ? void 0 : urlPart.includes("https")
-    );
+    ].map((urlPart) => urlPart?.toString());
+    const isSecureProtocol = urlParts.some((urlPart) => urlPart?.includes("https"));
     const protocol = isSecureProtocol ? "https" : "http";
     const actualUrlParts = urlParts.filter((urlPart) => urlPart).map((urlPart) => {
-      return urlPart == null ? void 0 : urlPart.replace(/^(https?:\/\/|\/)?(.*?)(\/?)$/, "$2");
+      return urlPart?.replace(/^(https?:\/\/|\/)?(.*?)(\/?)$/, "$2");
     });
     const url = `${protocol}://${actualUrlParts.join("/")}`;
-    this.config = __spreadProps(__spreadValues({}, this.config), {
+    this.config = {
+      ...this.config,
       url
-    });
+    };
     return this;
   }
   makeMethod() {
-    this.config = __spreadProps(__spreadValues({}, this.config), {
+    this.config = {
+      ...this.config,
       method: this.requestConfig.method
-    });
+    };
     return this;
   }
   makeData() {
@@ -162,31 +141,34 @@ var RequestBuilder = class {
       return this;
     }
     if (this.requestConfig.urlencoded) {
-      this.config = __spreadProps(__spreadValues({}, this.config), {
+      this.config = {
+        ...this.config,
         data: stringify(this.requestConfig.data)
-      });
+      };
       return this;
     }
-    this.config = __spreadProps(__spreadValues({}, this.config), {
+    this.config = {
+      ...this.config,
       data: this.requestConfig.data
-    });
+    };
     return this;
   }
   makeParams() {
-    this.config = __spreadProps(__spreadValues({}, this.config), {
+    this.config = {
+      ...this.config,
       params: this.requestConfig.params
-    });
+    };
     return this;
   }
   makeSerializer() {
-    this.config = __spreadProps(__spreadValues({}, this.config), {
+    this.config = {
+      ...this.config,
       paramsSerializer: (params) => {
-        var _a;
         return stringify(params, {
-          arrayFormat: (_a = this.baseConfig.serializer) == null ? void 0 : _a.array
+          arrayFormat: this.baseConfig.serializer?.array
         });
       }
-    });
+    };
     return this;
   }
   build() {
@@ -197,246 +179,283 @@ var RequestBuilder = class {
 // src/data-source.ts
 import axios from "axios";
 
-// src/logger/logger.ts
+// src/logger/builder.ts
 import { stringify as stringify2 } from "qs";
-var makeType = (type) => {
-  return `[${type}]`;
-};
-var makeUrl = (dto = {}) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  const url = ((_a = dto.request) == null ? void 0 : _a.url) || ((_c = (_b = dto.response) == null ? void 0 : _b.config) == null ? void 0 : _c.url) || ((_e = (_d = dto.error) == null ? void 0 : _d.response) == null ? void 0 : _e.config.url);
-  const params = ((_f = dto.request) == null ? void 0 : _f.params) || ((_h = (_g = dto.response) == null ? void 0 : _g.config) == null ? void 0 : _h.params) || ((_j = (_i = dto.error) == null ? void 0 : _i.response) == null ? void 0 : _j.config.params);
-  if (!url) {
-    return "";
-  }
-  if (params) {
-    delete params["0"];
-    return [url, stringify2(params)].filter((_) => _).join("?");
-  } else {
-    return url;
+var MessageBuilder = class {
+  printQueue;
+  request;
+  response;
+  error;
+  constructor() {
+    this.printQueue = [];
   }
-};
-var makeMethod = (dto = {}) => {
-  var _a, _b, _c, _d, _e;
-  const method = ((_a = dto.request) == null ? void 0 : _a.method) || ((_c = (_b = dto.response) == null ? void 0 : _b.config) == null ? void 0 : _c.method) || ((_e = (_d = dto.error) == null ? void 0 : _d.response) == null ? void 0 : _e.config.method);
-  if (!method) {
-    return "get" /* GET */;
+  setRequest(request) {
+    this.request = request;
+    return this;
   }
-  return method.toLowerCase();
-};
-var makeMethodText = (dto = {}) => {
-  var _a, _b, _c, _d, _e;
-  const method = ((_a = dto.request) == null ? void 0 : _a.method) || ((_c = (_b = dto.response) == null ? void 0 : _b.config) == null ? void 0 : _c.method) || ((_e = (_d = dto.error) == null ? void 0 : _d.response) == null ? void 0 : _e.config.method);
-  if (!method) {
-    return "";
+  setResponse(response) {
+    this.response = response;
+    return this;
   }
-  return method.toUpperCase();
-};
-var makeRequestData = (dto = {}) => {
-  var _a, _b, _c, _d, _e, _f;
-  const data = ((_a = dto.request) == null ? void 0 : _a.body) || ((_b = dto.request) == null ? void 0 : _b.data) || ((_d = (_c = dto.response) == null ? void 0 : _c.config) == null ? void 0 : _d.data) || ((_f = (_e = dto.error) == null ? void 0 : _e.response) == null ? void 0 : _f.config.data);
-  if (!data) {
-    return "";
+  setError(error) {
+    this.error = error;
+    return this;
   }
-  if (typeof data === "string") {
-    return data;
+  makeType(type) {
+    this.printQueue.push(`[${type}]`);
+    return this;
   }
-  return JSON.stringify(data);
-};
-var makeResponseData = (dto = {}) => {
-  var _a, _b, _c;
-  const data = ((_a = dto.response) == null ? void 0 : _a.data) || ((_c = (_b = dto.error) == null ? void 0 : _b.response) == null ? void 0 : _c.data);
-  if (!data) {
-    return "";
+  makeUrl() {
+    const url = this.request?.url || this.response?.config?.url || this.error?.response?.config.url;
+    const params = this.request?.params || this.response?.config?.params || this.error?.response?.config.params;
+    if (url) {
+      if (params) {
+        delete params["0"];
+        this.printQueue.push([url, stringify2(params)].filter((_) => _).join("?"));
+      } else {
+        this.printQueue.push(url);
+      }
+    }
+    return this;
   }
-  if (typeof data === "string") {
-    return data;
+  makeMethodText() {
+    const method = this.request?.method || this.response?.config?.method || this.error?.response?.config.method;
+    if (method) {
+      this.printQueue.push(method.toUpperCase());
+    }
+    return this;
   }
-  return JSON.stringify(data);
-};
-var makeStatus = (dto = {}) => {
-  var _a, _b, _c;
-  const status = ((_a = dto.response) == null ? void 0 : _a.status) || ((_c = (_b = dto.error) == null ? void 0 : _b.response) == null ? void 0 : _c.status);
-  if (!status) {
-    return 500 /* INTERNAL_SERVER_ERROR */;
+  makeRequestData() {
+    const data = this.request?.data || this.response?.config?.data || this.error?.response?.config.data;
+    if (data) {
+      if (typeof data === "string") {
+        this.printQueue.push(data);
+        return this;
+      }
+      if (Object.keys(data).length) {
+        this.printQueue.push(JSON.stringify(data));
+        return this;
+      }
+    }
+    return this;
   }
-  return status;
-};
-var makeStatusText = (dto = {}) => {
-  var _a, _b, _c, _d, _e, _f;
-  const status = ((_a = dto.response) == null ? void 0 : _a.status) || ((_c = (_b = dto.error) == null ? void 0 : _b.response) == null ? void 0 : _c.status);
-  if (!status) {
-    return "";
+  makeResponseDataText() {
+    const data = this.response?.data || this.error?.response?.data;
+    if (data) {
+      if (typeof data === "string") {
+        this.printQueue.push(data);
+        return this;
+      }
+      if (Object.keys(data).length) {
+        this.printQueue.push(JSON.stringify(data));
+        return this;
+      }
+    }
+    return this;
   }
-  const statusText = ((_d = dto.response) == null ? void 0 : _d.statusText) || ((_f = (_e = dto.error) == null ? void 0 : _e.response) == null ? void 0 : _f.statusText);
-  if (statusText) {
-    return `${status} ${statusText}`;
+  makeStatusText() {
+    const status = this.response?.status || this.error?.response?.status;
+    if (status) {
+      this.printQueue.push(`${status}`);
+      const statusText = this.response?.statusText || this.error?.response?.statusText;
+      if (statusText) {
+        this.printQueue.push(statusText);
+      }
+    }
+    return this;
+  }
+  build() {
+    return this.printQueue.join(" ");
+  }
+  makeMethod() {
+    const method = this.request?.method || this.response?.config?.method || this.error?.response?.config.method;
+    if (!method) {
+      return "get" /* GET */;
+    }
+    return method.toLowerCase();
+  }
+  makeResponseData() {
+    const data = this.response?.data || this.error?.response?.data;
+    if (!data) {
+      return "";
+    }
+    if (typeof data === "string") {
+      return data;
+    }
+    return JSON.stringify(data);
+  }
+  makeStatus() {
+    const status = this.response?.status || this.error?.response?.status;
+    if (!status) {
+      return 500 /* INTERNAL_SERVER_ERROR */;
+    }
+    return status;
+  }
+  makeResponse() {
+    return {
+      success: this.error === void 0,
+      status: this.makeStatus(),
+      method: this.makeMethod(),
+      data: this.makeResponseData()
+    };
   }
-  return `${status}`;
-};
-var makeResponse = (dto = {}) => {
-  return {
-    success: dto.error === void 0,
-    status: makeStatus(dto),
-    method: makeMethod(dto),
-    data: makeResponseData(dto)
-  };
-};
-var logRequest = (request) => {
-  log([
-    makeType("Request"),
-    makeMethodText({ request }),
-    makeUrl({ request }),
-    makeRequestData({ request })
-  ]);
-};
-var logResponse = (response) => {
-  log([
-    makeType("Response"),
-    makeMethodText({ response }),
-    makeUrl({ response }),
-    makeRequestData({ response }),
-    makeStatusText({ response }),
-    makeResponseData({ response })
-  ]);
-};
-var logRequestError = (error) => {
-  log([
-    makeType("Error"),
-    makeMethodText({ error }),
-    makeUrl({ error }),
-    makeRequestData({ error }),
-    makeStatusText({ error }),
-    makeResponseData({ error })
-  ]);
-};
-var log = (messageParts) => {
-  const message = messageParts.filter((_) => _).join(" ");
-  console.log(message);
 };
-var loggerHelper = {
-  makeType,
-  makeUrl,
-  makeMethod,
-  makeMethodText,
-  makeRequestData,
-  makeResponseData,
-  makeStatus,
-  makeStatusText,
-  makeResponse,
-  logRequest,
-  logResponse,
-  logRequestError
+
+// src/logger/service.ts
+var LoggerService = class {
+  context = "";
+  constructor(context = "") {
+    this.context = context;
+  }
+  log(message, context) {
+    const ctx = context || this.context || "";
+    if (ctx) {
+      return console.log(`[${ctx}] ${message}`);
+    }
+    return console.log(message);
+  }
+  logRequest(request) {
+    const loggerMessageBuilder = new MessageBuilder();
+    const message = loggerMessageBuilder.setRequest(request).makeType("Request").makeMethodText().makeUrl().makeRequestData().build();
+    return this.log(message);
+  }
+  logResponse(response) {
+    const loggerMessageBuilder = new MessageBuilder();
+    const message = loggerMessageBuilder.setResponse(response).makeType("Response").makeMethodText().makeUrl().makeRequestData().makeStatusText().makeResponseDataText().build();
+    return this.log(message);
+  }
+  logRequestError(error) {
+    const loggerMessageBuilder = new MessageBuilder();
+    const message = loggerMessageBuilder.setError(error).makeType("Error").makeMethodText().makeUrl().makeRequestData().makeStatusText().makeResponseDataText().build();
+    return this.log(message);
+  }
+  makeResponse(response) {
+    const loggerMessageBuilder = new MessageBuilder();
+    const responseData = loggerMessageBuilder.setResponse(response).makeResponse();
+    return responseData;
+  }
+  makeErrorResponse(error) {
+    const loggerMessageBuilder = new MessageBuilder();
+    const errorResponseData = loggerMessageBuilder.setError(error).makeResponse();
+    return errorResponseData;
+  }
 };
 
 // src/data-source.ts
 var RequestDataSource = class {
+  baseRequestConfig;
   constructor(baseRequestConfig) {
     this.baseRequestConfig = baseRequestConfig;
   }
   common(requestConfig, responseConfig = {}) {
+    const loggerService = new LoggerService(this.baseRequestConfig.name);
     const requestBuilder = new RequestBuilder({
       baseConfig: this.baseRequestConfig,
       requestConfig
     });
     const request = requestBuilder.makeContentType().makeAuth().makeUrl().makeMethod().makeParams().makeData().makeSerializer().build();
     if (this.baseRequestConfig.logger) {
-      loggerHelper.logRequest(request);
+      loggerService.logRequest(request);
     }
     return axios.request(request).then((response) => {
       if (this.baseRequestConfig.logger) {
-        loggerHelper.logResponse(response);
+        loggerService.logResponse(response);
       }
       if (responseConfig.raw) {
-        return loggerHelper.makeResponse({ response });
+        return loggerService.makeResponse(response);
       }
       return response.data;
     }).catch((error) => {
-      var _a;
       if (this.baseRequestConfig.debug) {
         console.log("Error:", error);
       }
       if (this.baseRequestConfig.logger) {
-        loggerHelper.logRequestError(error);
+        loggerService.logRequestError(error);
       }
       if (responseConfig.raw) {
-        return loggerHelper.makeResponse({ error });
+        return loggerService.makeErrorResponse(error);
       }
-      throw ((_a = error.response) == null ? void 0 : _a.data) || error.response || new Error(error.message);
+      throw error.response?.data || error.response || new Error(error.message);
     });
   }
   search(config = {}) {
-    return this.common(__spreadProps(__spreadValues({}, config), {
+    return this.common({
+      ...config,
       method: "get" /* GET */
-    }));
-  }
-  bulkSearch() {
-    return __asyncGenerator(this, arguments, function* (config = {}) {
-      var _a, _b, _c;
-      let pagination = {
-        total: 0,
-        currentPage: ((_a = config.params) == null ? void 0 : _a.page) || 0,
-        lastPage: 0,
-        from: 0,
-        to: 0,
-        pageSize: ((_b = config.params) == null ? void 0 : _b.pageSize) || 30
-      };
-      do {
-        const response = yield new __await(this.common(__spreadProps(__spreadValues({}, config), {
-          method: "get" /* GET */,
-          params: __spreadProps(__spreadValues({}, config.params), {
-            page: pagination.currentPage + 1,
-            pageSize: pagination.pageSize
-          })
-        })));
-        if (!((_c = response.data) == null ? void 0 : _c.length)) {
-          return [];
-        }
-        yield response.data;
-        pagination = response.pagination;
-      } while (pagination.currentPage !== pagination.lastPage);
     });
   }
+  async *bulkSearch(config = {}) {
+    let pagination = {
+      total: 0,
+      currentPage: config.params?.page || 0,
+      lastPage: 0,
+      from: 0,
+      to: 0,
+      pageSize: config.params?.pageSize || 30
+    };
+    do {
+      const response = await this.common({
+        ...config,
+        method: "get" /* GET */,
+        params: {
+          ...config.params,
+          page: pagination.currentPage + 1,
+          pageSize: pagination.pageSize
+        }
+      });
+      if (!response.data?.length) {
+        return [];
+      }
+      yield response.data;
+      pagination = response.pagination;
+    } while (pagination.currentPage !== pagination.lastPage);
+  }
   get(id, config = {}) {
-    return this.common(__spreadProps(__spreadValues({}, config), {
+    return this.common({
+      ...config,
       method: "get" /* GET */,
       url: id
-    }));
+    });
   }
   create(config) {
-    return this.common(__spreadProps(__spreadValues({}, config), {
+    return this.common({
+      ...config,
       method: "post" /* POST */
-    }));
+    });
   }
   bulkCreate(config) {
-    return this.common(__spreadProps(__spreadValues({}, config), {
+    return this.common({
+      ...config,
       method: "post" /* POST */,
       url: "/bulk",
       data: {
         bulk: config.data
       }
-    }));
+    });
   }
   update(id, config) {
-    return this.common(__spreadProps(__spreadValues({}, config), {
+    return this.common({
+      ...config,
       method: "put" /* PUT */,
       url: id
-    }));
+    });
   }
   bulkUpdate(config) {
-    return this.common(__spreadProps(__spreadValues({}, config), {
+    return this.common({
+      ...config,
       method: "put" /* PUT */,
       url: "/bulk",
       data: {
         bulk: config.data
       }
-    }));
+    });
   }
   remove(id, config = {}) {
-    return this.common(__spreadProps(__spreadValues({}, config), {
+    return this.common({
+      ...config,
       method: "delete" /* DELETE */,
       url: id
-    }));
+    });
   }
 };