@minimaltech/node-infra 0.5.9-13 → 0.5.9-15

package/dist/helpers/crypto/algorithms/rsa.algorithm.js

@@ -8,15 +8,14 @@ const node_crypto_1 = __importDefault(require("node:crypto"));
 const base_algorithm_1 = require("./base.algorithm");
 class RSA extends base_algorithm_1.BaseCryptoAlgorithm {
     constructor(opts) {
-        super(Object.assign({ scope: RSA.name }, opts));
+        super({ scope: RSA.name, ...opts });
     }
     static withAlgorithm() {
         return new RSA({ algorithm: 'rsa' });
     }
     generateDERKeyPair(opts) {
-        var _a;
         const keys = node_crypto_1.default.generateKeyPairSync('rsa', {
-            modulusLength: (_a = opts === null || opts === void 0 ? void 0 : opts.modulus) !== null && _a !== void 0 ? _a : 1199,
+            modulusLength: opts?.modulus ?? 1199,
         });
         return {
             publicKey: keys.publicKey.export({ type: 'spki', format: 'der' }),
@@ -24,7 +23,7 @@ class RSA extends base_algorithm_1.BaseCryptoAlgorithm {
         };
     }
     encrypt(message, pubKey, opts) {
-        const { inputEncoding = { key: 'base64', message: 'utf-8' }, outputEncoding = 'base64', doThrow = true, } = opts !== null && opts !== void 0 ? opts : {};
+        const { inputEncoding = { key: 'base64', message: 'utf-8' }, outputEncoding = 'base64', doThrow = true, } = opts ?? {};
         try {
             const k = node_crypto_1.default.createPublicKey({
                 key: Buffer.from(pubKey, inputEncoding.key),
@@ -42,7 +41,7 @@ class RSA extends base_algorithm_1.BaseCryptoAlgorithm {
         }
     }
     decrypt(message, privKey, opts) {
-        const { inputEncoding = { key: 'base64', message: 'base64' }, outputEncoding = 'utf-8', doThrow = true, } = opts !== null && opts !== void 0 ? opts : {};
+        const { inputEncoding = { key: 'base64', message: 'base64' }, outputEncoding = 'utf-8', doThrow = true, } = opts ?? {};
         try {
             const k = node_crypto_1.default.createPrivateKey({
                 key: Buffer.from(privKey, inputEncoding.key),
@@ -61,4 +60,3 @@ class RSA extends base_algorithm_1.BaseCryptoAlgorithm {
     }
 }
 exports.RSA = RSA;
-//# sourceMappingURL=rsa.algorithm.js.map

package/dist/helpers/crypto/common/constants.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_PAD_END = exports.DEFAULT_CIPHER_BITS = void 0;
 exports.DEFAULT_CIPHER_BITS = 256;
 exports.DEFAULT_PAD_END = (0x00).toString();
-//# sourceMappingURL=constants.js.map

package/dist/helpers/crypto/common/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./constants"), exports);
-//# sourceMappingURL=index.js.map

package/dist/helpers/crypto/common/types.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package/dist/helpers/crypto/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./common"), exports);
 __exportStar(require("./algorithms"), exports);
-//# sourceMappingURL=index.js.map

package/dist/helpers/database/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./query-builder.helper"), exports);
-//# sourceMappingURL=index.js.map

package/dist/helpers/database/query-builder.helper.js

@@ -8,9 +8,10 @@ const base_helper_1 = require("../../base/base.helper");
 const utilities_1 = require("../../utilities");
 const knex_1 = __importDefault(require("knex"));
 class QueryBuilderHelper extends base_helper_1.BaseHelper {
+    static instance;
+    clients = new Map();
     constructor(opts) {
         super({ scope: QueryBuilderHelper.name, identifier: QueryBuilderHelper.name });
-        this.clients = new Map();
         const { clientType } = opts;
         this.clients.set(clientType, (0, knex_1.default)({ client: clientType }));
     }
@@ -20,7 +21,6 @@ class QueryBuilderHelper extends base_helper_1.BaseHelper {
         }
         return this.instance;
     }
-    // ----------------------------------------------------------------------------------------------------
     getQueryBuilder(opts) {
         const { clientType } = opts;
         if (!this.clients.has(clientType)) {
@@ -51,20 +51,17 @@ class QueryBuilderHelper extends base_helper_1.BaseHelper {
         }
         return queryClient(tableName).withSchema(schema);
     }
-    // ----------------------------------------------------------------------------------------------------
     static getPostgresQueryBuilder() {
         const clientType = 'pg';
         const ins = QueryBuilderHelper.getInstance({ clientType });
         return ins.getQueryBuilder({ clientType });
     }
-    // ----------------------------------------------------------------------------------------------------
     static getPostgresUpdateBuilder(opts) {
         const { tableName, schema = 'public' } = opts;
         const clientType = 'pg';
         const ins = QueryBuilderHelper.getInstance({ clientType });
         return ins.getUpdateBuilder({ clientType, tableName, schema });
     }
-    // ----------------------------------------------------------------------------------------------------
     static getMySQLQueryBuilder() {
         const clientType = 'mysql';
         const ins = QueryBuilderHelper.getInstance({ clientType });
@@ -72,4 +69,3 @@ class QueryBuilderHelper extends base_helper_1.BaseHelper {
     }
 }
 exports.QueryBuilderHelper = QueryBuilderHelper;
-//# sourceMappingURL=query-builder.helper.js.map

package/dist/helpers/index.js

@@ -25,4 +25,3 @@ __exportStar(require("./testing"), exports);
 __exportStar(require("./worker-thread"), exports);
 __exportStar(require("./application-environment.helper"), exports);
 __exportStar(require("./cron.helper"), exports);
-//# sourceMappingURL=index.js.map

package/dist/helpers/logger/application-logger.js

@@ -2,13 +2,12 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationLogger = exports.Logger = void 0;
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const default_logger_1 = require("./default-logger");
 const utilities_1 = require("../../utilities");
-const extraLogEnvs = (_b = ((_a = process.env.APP_ENV_EXTRA_LOG_ENVS) !== null && _a !== void 0 ? _a : '').split(',').map(el => el.trim())) !== null && _b !== void 0 ? _b : [];
+const extraLogEnvs = (process.env.APP_ENV_EXTRA_LOG_ENVS ?? '').split(',').map(el => el.trim()) ?? [];
 const LOG_ENVIRONMENTS = new Set([
     'local',
     'development',
@@ -18,19 +17,17 @@ const LOG_ENVIRONMENTS = new Set([
     ...extraLogEnvs,
 ]);
 class Logger {
+    environment = process.env.NODE_ENV;
+    scopes = [];
+    customLogger;
     constructor(opts) {
-        this.environment = process.env.NODE_ENV;
-        this.scopes = [];
-        this.customLogger = opts === null || opts === void 0 ? void 0 : opts.customLogger;
+        this.customLogger = opts?.customLogger;
     }
-    // ---------------------------------------------------------------------
     getLogger() {
-        var _a;
-        return (_a = this.customLogger) !== null && _a !== void 0 ? _a : default_logger_1.applicationLogger;
+        return this.customLogger ?? default_logger_1.applicationLogger;
     }
-    // ---------------------------------------------------------------------
     _enhanceMessage(parts, message) {
-        const enhanced = parts === null || parts === void 0 ? void 0 : parts.reduce((prevState = '', current) => {
+        const enhanced = parts?.reduce((prevState = '', current) => {
             if ((0, isEmpty_1.default)(prevState)) {
                 return current;
             }
@@ -38,7 +35,6 @@ class Logger {
         }, '');
         return `[${enhanced}]${message}`;
     }
-    // ---------------------------------------------------------------------
     withScope(scope) {
         if (this.scopes.length < 2) {
             this.scopes.push(scope);
@@ -50,7 +46,6 @@ class Logger {
         this.scopes[1] = scope;
         return this;
     }
-    // ---------------------------------------------------------------------
     log(level, message, ...args) {
         const logger = this.getLogger();
         if (!logger) {
@@ -59,7 +54,6 @@ class Logger {
         const enhanced = this._enhanceMessage(this.scopes, message);
         logger.log(level, enhanced, ...args);
     }
-    // ---------------------------------------------------------------------
     debug(message, ...args) {
         if (this.environment && !LOG_ENVIRONMENTS.has(this.environment)) {
             return;
@@ -69,19 +63,15 @@ class Logger {
         }
         this.log('debug', message, ...args);
     }
-    // ---------------------------------------------------------------------
     info(message, ...args) {
         this.log('info', message, ...args);
     }
-    // ---------------------------------------------------------------------
     warn(message, ...args) {
         this.log('warn', message, ...args);
     }
-    // ---------------------------------------------------------------------
     error(message, ...args) {
         this.log('error', message, ...args);
     }
-    // ---------------------------------------------------------------------
     emerg(message, ...args) {
         this.log('emerg', message, ...args);
     }
@@ -90,4 +80,3 @@ exports.Logger = Logger;
 class ApplicationLogger extends Logger {
 }
 exports.ApplicationLogger = ApplicationLogger;
-//# sourceMappingURL=application-logger.js.map

package/dist/helpers/logger/common/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
-//# sourceMappingURL=index.js.map

package/dist/helpers/logger/common/types.js

@@ -1,32 +1,29 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogLevels = void 0;
 class LogLevels {
+    static ERROR = 'error';
+    static ALERT = 'alert';
+    static EMERG = 'emerg';
+    static WARN = 'warn';
+    static INFO = 'info';
+    static HTTP = 'http';
+    static VERBOSE = 'verbose';
+    static DEBUG = 'debug';
+    static SILLY = 'silly';
+    static SCHEME_SET = new Set([
+        this.ERROR,
+        this.ALERT,
+        this.EMERG,
+        this.WARN,
+        this.INFO,
+        this.HTTP,
+        this.VERBOSE,
+        this.DEBUG,
+        this.SILLY,
+    ]);
     static isValid(input) {
         return this.SCHEME_SET.has(input);
     }
 }
 exports.LogLevels = LogLevels;
-_a = LogLevels;
-LogLevels.ERROR = 'error';
-LogLevels.ALERT = 'alert';
-LogLevels.EMERG = 'emerg';
-LogLevels.WARN = 'warn';
-LogLevels.INFO = 'info';
-LogLevels.HTTP = 'http';
-LogLevels.VERBOSE = 'verbose';
-LogLevels.DEBUG = 'debug';
-LogLevels.SILLY = 'silly';
-LogLevels.SCHEME_SET = new Set([
-    _a.ERROR,
-    _a.ALERT,
-    _a.EMERG,
-    _a.WARN,
-    _a.INFO,
-    _a.HTTP,
-    _a.VERBOSE,
-    _a.DEBUG,
-    _a.SILLY,
-]);
-//# sourceMappingURL=types.js.map

package/dist/helpers/logger/default-logger.js

@@ -2,7 +2,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationLogger = exports.defineCustomLogger = exports.applicationLogFormatter = exports.defineCustomLoggerFormatter = void 0;
 const common_1 = require("../../common");
@@ -11,19 +10,16 @@ const winston_1 = __importDefault(require("winston"));
 require("winston-daily-rotate-file");
 const transports_1 = require("./transports");
 const utilities_1 = require("../../utilities");
-const LOGGER_FOLDER_PATH = (_a = process.env.APP_ENV_LOGGER_FOLDER_PATH) !== null && _a !== void 0 ? _a : './';
+const LOGGER_FOLDER_PATH = process.env.APP_ENV_LOGGER_FOLDER_PATH ?? './';
 const LOGGER_PREFIX = common_1.App.APPLICATION_NAME;
 const f = winston_1.default.format;
-// -------------------------------------------------------------------------------------------
 const defineCustomLoggerFormatter = (opts) => {
     return f.combine(f.simple(), f.label({ label: opts.label }), f.timestamp(), f.splat(), f.align(), f.colorize(), f.printf(({ level, message, label, timestamp }) => {
         return `${timestamp} [${label}] ${level}: ${message}`;
     }), f.errors({ stack: true }));
 };
 exports.defineCustomLoggerFormatter = defineCustomLoggerFormatter;
-// -------------------------------------------------------------------------------------------
 exports.applicationLogFormatter = (0, exports.defineCustomLoggerFormatter)({ label: LOGGER_PREFIX });
-// -------------------------------------------------------------------------------------------
 const defineCustomLogger = (opts) => {
     const { logLevels = {
         error: 0,
@@ -51,7 +47,6 @@ const defineCustomLogger = (opts) => {
         general: [consoleLogTransport],
         exception: [consoleLogTransport],
     };
-    // File configure
     if (infoTransportOptions.file) {
         const transport = new winston_1.default.transports.DailyRotateFile({
             frequency: '1h',
@@ -75,7 +70,6 @@ const defineCustomLogger = (opts) => {
         transports.general.push(transport);
         transports.exception.push(transport);
     }
-    // Stream configure
     if (infoTransportOptions.dgram) {
         const transport = transports_1.DgramTransport.fromPartial(infoTransportOptions.dgram);
         if (transport) {
@@ -88,9 +82,7 @@ const defineCustomLogger = (opts) => {
             transports.exception.push(transport);
         }
     }
-    // Color configure
     winston_1.default.addColors(logColors);
-    // Logger
     return winston_1.default.createLogger({
         levels: logLevels,
         format: loggerFormatter,
@@ -100,20 +92,17 @@ const defineCustomLogger = (opts) => {
     });
 };
 exports.defineCustomLogger = defineCustomLogger;
-// -------------------------------------------------------------------------------------------
 const fileOptions = { folder: LOGGER_FOLDER_PATH, prefix: LOGGER_PREFIX };
 const dgramOptions = {
     socketOptions: { type: 'udp4' },
     host: process.env.APP_ENV_LOGGER_DGRAM_HOST,
     port: (0, utilities_1.int)(process.env.APP_ENV_LOGGER_DGRAM_PORT),
     label: process.env.APP_ENV_LOGGER_DGRAM_LABEL,
-    levels: (_c = (_b = process.env.APP_ENV_LOGGER_DGRAM_LEVELS) === null || _b === void 0 ? void 0 : _b.split(',').map(el => el.trim())) !== null && _c !== void 0 ? _c : [],
+    levels: process.env.APP_ENV_LOGGER_DGRAM_LEVELS?.split(',').map(el => el.trim()) ?? [],
 };
-// -------------------------------------------------------------------------------------------
 exports.applicationLogger = (0, exports.defineCustomLogger)({
     transports: {
         info: { file: fileOptions, dgram: dgramOptions },
         error: { file: fileOptions, dgram: dgramOptions },
     },
 });
-//# sourceMappingURL=default-logger.js.map

package/dist/helpers/logger/factory.js

@@ -4,10 +4,9 @@ exports.LoggerFactory = void 0;
 const application_logger_1 = require("./application-logger");
 class LoggerFactory {
     static getLogger(scopes, customLogger) {
-        const logger = customLogger !== null && customLogger !== void 0 ? customLogger : new application_logger_1.ApplicationLogger();
+        const logger = customLogger ?? new application_logger_1.ApplicationLogger();
         logger.withScope(scopes.join('-'));
         return logger;
     }
 }
 exports.LoggerFactory = LoggerFactory;
-//# sourceMappingURL=factory.js.map

package/dist/helpers/logger/index.js

@@ -18,4 +18,3 @@ __exportStar(require("./application-logger"), exports);
 __exportStar(require("./default-logger"), exports);
 __exportStar(require("./factory"), exports);
 __exportStar(require("./transports"), exports);
-//# sourceMappingURL=index.js.map

package/dist/helpers/logger/transports/dgram.transport.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,8 +9,14 @@ const utilities_1 = require("../../../utilities");
 const node_dgram_1 = __importDefault(require("node:dgram"));
 const winston_transport_1 = __importDefault(require("winston-transport"));
 class DgramTransport extends winston_transport_1.default {
+    label;
+    host;
+    port;
+    triggerLevels;
+    socketOptions;
+    client;
     constructor(opts) {
-        const { label, host, port, levels, socketOptions } = opts, defaultTransportOptions = __rest(opts, ["label", "host", "port", "levels", "socketOptions"]);
+        const { label, host, port, levels, socketOptions, ...defaultTransportOptions } = opts;
         super(defaultTransportOptions);
         this.label = label;
         this.host = host;
@@ -31,12 +26,11 @@ class DgramTransport extends winston_transport_1.default {
         this.establish({ socketOptions: this.socketOptions });
     }
     static fromPartial(opts) {
-        var _a;
-        if (!(opts === null || opts === void 0 ? void 0 : opts.label) ||
-            !(opts === null || opts === void 0 ? void 0 : opts.host) ||
-            !(opts === null || opts === void 0 ? void 0 : opts.port) ||
-            !((_a = opts === null || opts === void 0 ? void 0 : opts.levels) === null || _a === void 0 ? void 0 : _a.length) ||
-            !(opts === null || opts === void 0 ? void 0 : opts.socketOptions)) {
+        if (!opts?.label ||
+            !opts?.host ||
+            !opts?.port ||
+            !opts?.levels?.length ||
+            !opts?.socketOptions) {
             return null;
         }
         return new DgramTransport(opts);
@@ -44,8 +38,7 @@ class DgramTransport extends winston_transport_1.default {
     establish(opts) {
         this.client = node_dgram_1.default.createSocket(opts.socketOptions);
         this.client.on('error', error => {
-            var _a;
-            (_a = this.client) === null || _a === void 0 ? void 0 : _a.close();
+            this.client?.close();
             this.client = null;
             throw (0, utilities_1.getError)({
                 statusCode: common_1.ResultCodes.RS_5.InternalServerError,
@@ -54,12 +47,10 @@ class DgramTransport extends winston_transport_1.default {
         });
     }
     formatMessage(opts) {
-        var _a;
-        const { timestamp, label, message } = opts, rest = __rest(opts, ["timestamp", "label", "message"]);
-        return [timestamp, `[${(_a = this.label) !== null && _a !== void 0 ? _a : label}]`, rest[Symbol.for('level')], message].join(' ');
+        const { timestamp, label, message, ...rest } = opts;
+        return [timestamp, `[${this.label ?? label}]`, rest[Symbol.for('level')], message].join(' ');
     }
     log(opts, callback) {
-        var _a;
         setImmediate(() => {
             this.emit('logged', opts);
         });
@@ -72,7 +63,7 @@ class DgramTransport extends winston_transport_1.default {
             this.establish({ socketOptions: this.socketOptions });
         }
         const message = this.formatMessage(opts);
-        (_a = this.client) === null || _a === void 0 ? void 0 : _a.send(message, this.port, this.host, error => {
+        this.client?.send(message, this.port, this.host, error => {
             if (error) {
                 this.emit('error', error);
             }
@@ -81,4 +72,3 @@ class DgramTransport extends winston_transport_1.default {
     }
 }
 exports.DgramTransport = DgramTransport;
-//# sourceMappingURL=dgram.transport.js.map

package/dist/helpers/logger/transports/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./dgram.transport"), exports);
-//# sourceMappingURL=index.js.map

package/dist/helpers/network/http-request/base-network-request.helper.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,8 +9,9 @@ const utilities_1 = require("../../../utilities");
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const axios_fetcher_1 = require("./fetcher/axios-fetcher");
 const node_fetcher_1 = require("./fetcher/node-fetcher");
-// -----------------------------------------------------------------------------
 class BaseNetworkRequest extends base_helper_1.BaseHelper {
+    baseUrl;
+    fetcher;
     constructor(opts) {
         super({ scope: opts.name, identifier: opts.name });
         const { networkOptions } = opts;
@@ -30,12 +20,11 @@ class BaseNetworkRequest extends base_helper_1.BaseHelper {
         this.fetcher = opts.fetcher;
     }
     getRequestPath(opts) {
-        var _a;
-        const paths = (_a = opts === null || opts === void 0 ? void 0 : opts.paths) !== null && _a !== void 0 ? _a : [];
+        const paths = opts?.paths ?? [];
         const rs = paths
             .map((path) => {
             if (!path.startsWith('/')) {
-                path = `/${path}`; // Add / to the start of url path
+                path = `/${path}`;
             }
             return path;
         })
@@ -43,9 +32,8 @@ class BaseNetworkRequest extends base_helper_1.BaseHelper {
         return rs;
     }
     getRequestUrl(opts) {
-        var _a, _b, _c;
-        let baseUrl = (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.baseUrl) !== null && _a !== void 0 ? _a : this.baseUrl) !== null && _b !== void 0 ? _b : '';
-        const paths = (_c = opts === null || opts === void 0 ? void 0 : opts.paths) !== null && _c !== void 0 ? _c : [];
+        let baseUrl = opts?.baseUrl ?? this.baseUrl ?? '';
+        const paths = opts?.paths ?? [];
         if (!baseUrl || (0, isEmpty_1.default)(baseUrl)) {
             throw (0, utilities_1.getError)({
                 statusCode: 500,
@@ -53,10 +41,10 @@ class BaseNetworkRequest extends base_helper_1.BaseHelper {
             });
         }
         if (baseUrl.endsWith('/')) {
-            baseUrl = baseUrl.slice(0, -1); // Remove / at the end
+            baseUrl = baseUrl.slice(0, -1);
         }
         const joined = this.getRequestPath({ paths });
-        return `${baseUrl !== null && baseUrl !== void 0 ? baseUrl : this.baseUrl}${joined}`;
+        return `${baseUrl ?? this.baseUrl}${joined}`;
     }
     getNetworkService() {
         return this.fetcher;
@@ -66,30 +54,43 @@ class BaseNetworkRequest extends base_helper_1.BaseHelper {
     }
 }
 exports.BaseNetworkRequest = BaseNetworkRequest;
-// -----------------------------------------------------------------------------
 class AxiosNetworkRequest extends BaseNetworkRequest {
     constructor(opts) {
-        var _a;
         const { name, networkOptions } = opts;
-        const { headers = {}, baseUrl, timeout = 60 * 1000 } = networkOptions, rest = __rest(networkOptions, ["headers", "baseUrl", "timeout"]);
-        const defaultConfigs = Object.assign(Object.assign({}, rest), { baseURL: baseUrl, withCredentials: true, headers: Object.assign({}, headers, {
-                ['content-type']: (_a = headers['content-type']) !== null && _a !== void 0 ? _a : 'application/json; charset=utf-8',
-            }), validateStatus: (status) => status < 500, timeout });
-        super(Object.assign(Object.assign({}, opts), { variant: 'axios', fetcher: new axios_fetcher_1.AxiosFetcher({ name, defaultConfigs }) }));
+        const { headers = {}, baseUrl, timeout = 60 * 1000, ...rest } = networkOptions;
+        const defaultConfigs = {
+            ...rest,
+            baseURL: baseUrl,
+            withCredentials: true,
+            headers: Object.assign({}, headers, {
+                ['content-type']: headers['content-type'] ?? 'application/json; charset=utf-8',
+            }),
+            validateStatus: (status) => status < 500,
+            timeout,
+        };
+        super({
+            ...opts,
+            variant: 'axios',
+            fetcher: new axios_fetcher_1.AxiosFetcher({ name, defaultConfigs }),
+        });
     }
 }
 exports.AxiosNetworkRequest = AxiosNetworkRequest;
-// -----------------------------------------------------------------------------
 class NodeFetchNetworkRequest extends BaseNetworkRequest {
     constructor(opts) {
-        var _a;
         const { name, networkOptions } = opts;
-        const { headers = {} } = networkOptions, rest = __rest(networkOptions, ["headers"]);
-        const defaultConfigs = Object.assign(Object.assign({}, rest), { headers: Object.assign({}, headers, {
-                ['content-type']: (_a = headers['content-type']) !== null && _a !== void 0 ? _a : 'application/json; charset=utf-8',
-            }) });
-        super(Object.assign(Object.assign({}, opts), { variant: 'node-fetch', fetcher: new node_fetcher_1.NodeFetcher({ name, defaultConfigs }) }));
+        const { headers = {}, ...rest } = networkOptions;
+        const defaultConfigs = {
+            ...rest,
+            headers: Object.assign({}, headers, {
+                ['content-type']: headers['content-type'] ?? 'application/json; charset=utf-8',
+            }),
+        };
+        super({
+            ...opts,
+            variant: 'node-fetch',
+            fetcher: new node_fetcher_1.NodeFetcher({ name, defaultConfigs }),
+        });
     }
 }
 exports.NodeFetchNetworkRequest = NodeFetchNetworkRequest;
-//# sourceMappingURL=base-network-request.helper.js.map

package/dist/helpers/network/http-request/fetcher/axios-fetcher.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -19,34 +8,32 @@ const url_utility_1 = require("../../../../utilities/url.utility");
 const axios_1 = __importDefault(require("axios"));
 const node_https_1 = __importDefault(require("node:https"));
 const base_fetcher_1 = require("./base-fetcher");
-// -------------------------------------------------------------
 class AxiosFetcher extends base_fetcher_1.AbstractNetworkFetchableHelper {
     constructor(opts) {
-        var _a;
         super({ name: opts.name, variant: 'axios' });
         const { defaultConfigs } = opts;
-        (_a = opts === null || opts === void 0 ? void 0 : opts.logger) === null || _a === void 0 ? void 0 : _a.info('Creating new network request worker instance! Name: %s', this.name);
-        this.worker = axios_1.default.create(Object.assign({}, defaultConfigs));
+        opts?.logger?.info('Creating new network request worker instance! Name: %s', this.name);
+        this.worker = axios_1.default.create({ ...defaultConfigs });
     }
-    // -------------------------------------------------------------
-    // SEND REQUEST
-    // -------------------------------------------------------------
     send(opts, logger) {
-        const { url, method = 'get', params = {}, body: data, headers } = opts, rest = __rest(opts, ["url", "method", "params", "body", "headers"]);
-        const props = Object.assign({ url,
+        const { url, method = 'get', params = {}, body: data, headers, ...rest } = opts;
+        const props = {
+            url,
             method,
             params,
             data,
-            headers, paramsSerializer: { serialize: p => (0, url_utility_1.stringify)(p) } }, rest);
+            headers,
+            paramsSerializer: { serialize: p => (0, url_utility_1.stringify)(p) },
+            ...rest,
+        };
         const protocol = this.getProtocol(url);
         if (protocol === 'https') {
             props.httpsAgent = new node_https_1.default.Agent({
                 rejectUnauthorized: false,
             });
         }
-        logger === null || logger === void 0 ? void 0 : logger.info('[send] URL: %s | Props: %o', url, props);
+        logger?.info('[send] URL: %s | Props: %o', url, props);
         return this.worker.request(props);
     }
 }
 exports.AxiosFetcher = AxiosFetcher;
-//# sourceMappingURL=axios-fetcher.js.map