drapcode-utility 1.2.1-beta → 1.2.2-beta

package/build/encryption/KMS.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/build/encryption/crypt.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -88,7 +88,7 @@ var handleExtraString = function (key, append) {
     if (append) {
         var start = crypto_1.default.randomBytes(2).toString("hex");
         var end = crypto_1.default.randomBytes(2).toString("hex");
-        key = "".concat(start).concat(key).concat(end);
+        key = "" + start + key + end;
         return key;
     }
     else {

package/build/encryption/file.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -58,11 +58,11 @@ var processFileEncryptionDecryption = function (data, encryption, decrypt) { ret
                 return [3 /*break*/, 6];
             case 1:
                 if (!decrypt) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, exports.decryptFile)(data, dataKey)];
+                return [4 /*yield*/, exports.decryptFile(data, dataKey)];
             case 2:
                 _b = _c.sent();
                 return [3 /*break*/, 5];
-            case 3: return [4 /*yield*/, (0, exports.encryptFile)(data, dataKey)];
+            case 3: return [4 /*yield*/, exports.encryptFile(data, dataKey)];
             case 4:
                 _b = _c.sent();
                 _c.label = 5;
@@ -117,7 +117,7 @@ var decryptFile = function (encryptedFilePath, key) { return __awaiter(void 0, v
                 decipher = crypto_1.default.createDecipheriv(defaultAlgorithm, keyBuffer, iv);
                 decryptedBuffer = decipher.update(encryptedData);
                 decryptedBuffer = Buffer.concat([decryptedBuffer, decipher.final()]);
-                decryptedFilePath = "".concat(encryptedFilePath.slice(0, -4), ".dec");
+                decryptedFilePath = encryptedFilePath.slice(0, -4) + ".dec";
                 return [4 /*yield*/, fs_1.default.promises.writeFile(decryptedFilePath, decryptedBuffer)];
             case 2:
                 _a.sent();

package/build/encryption/index.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -53,7 +53,7 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
                     accessKeyId: accessKeyId,
                     secretAccessKey: secretAccessKey,
                 };
-                return [4 /*yield*/, (0, exports.processKMSDecryption)(config, encryption.dataKey, {})];
+                return [4 /*yield*/, exports.processKMSDecryption(config, encryption.dataKey, {})];
             case 1:
                 plainTextData = _b.sent();
                 if (plainTextData.status === "FAILED") {
@@ -64,13 +64,13 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
             case 2:
                 if (!Array.isArray(data)) return [3 /*break*/, 4];
                 promises = data.map(function (item) {
-                    return (0, exports.processItemEncryptDecrypt)(item, fields, encryption, decrypt);
+                    return exports.processItemEncryptDecrypt(item, fields, encryption, decrypt);
                 });
                 return [4 /*yield*/, Promise.all(promises)];
             case 3:
                 data = _b.sent();
                 return [3 /*break*/, 6];
-            case 4: return [4 /*yield*/, (0, exports.processItemEncryptDecrypt)(data, fields, encryption, decrypt)];
+            case 4: return [4 /*yield*/, exports.processItemEncryptDecrypt(data, fields, encryption, decrypt)];
             case 5:
                 data = _b.sent();
                 _b.label = 6;
@@ -94,7 +94,7 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt) { r
                                 if (!(field && field.encrypted)) return [3 /*break*/, 2];
                                 _c = item;
                                 _d = fieldName;
-                                return [4 /*yield*/, (0, exports.processDataEncryptionDecryption)(item[fieldName], encryption, decrypt)];
+                                return [4 /*yield*/, exports.processDataEncryptionDecryption(item[fieldName], encryption, decrypt)];
                             case 1:
                                 _c[_d] = _e.sent();
                                 _e.label = 2;
@@ -134,11 +134,11 @@ var processDataEncryptionDecryption = function (data, encryption, decrypt) { ret
                 return [3 /*break*/, 6];
             case 1:
                 if (!decrypt) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, crypt_1.decryptData)(data, dataKey)];
+                return [4 /*yield*/, crypt_1.decryptData(data, dataKey)];
             case 2:
                 _b = _c.sent();
                 return [3 /*break*/, 5];
-            case 3: return [4 /*yield*/, (0, crypt_1.encryptData)(data, dataKey)];
+            case 3: return [4 /*yield*/, crypt_1.encryptData(data, dataKey)];
             case 4:
                 _b = _c.sent();
                 _c.label = 5;
@@ -161,7 +161,7 @@ var createKMSDataKey = function (config, arn) { return __awaiter(void 0, void 0,
     var dataKeyRes;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, KMS_1.processKMSGenerateDataKey)(config, arn)];
+            case 0: return [4 /*yield*/, KMS_1.processKMSGenerateDataKey(config, arn)];
             case 1:
                 dataKeyRes = _a.sent();
                 return [2 /*return*/, dataKeyRes];
@@ -182,7 +182,7 @@ var encryptDataWithKMS = function (config, arn, plainText, context) { return __a
     var cryptData;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, KMS_1.processKMSEncryption)(config, arn, plainText, context)];
+            case 0: return [4 /*yield*/, KMS_1.processKMSEncryption(config, arn, plainText, context)];
             case 1:
                 cryptData = _a.sent();
                 return [2 /*return*/, cryptData];
@@ -202,7 +202,7 @@ var decryptDataWithKMS = function (config, cipherText, context) { return __await
     var plainTextData;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.processKMSDecryption)(config, cipherText, context)];
+            case 0: return [4 /*yield*/, exports.processKMSDecryption(config, cipherText, context)];
             case 1:
                 plainTextData = _a.sent();
                 return [2 /*return*/, plainTextData];
@@ -241,7 +241,7 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
                     accessKeyId: accessKey,
                     secretAccessKey: secretKey,
                 };
-                return [4 /*yield*/, (0, exports.processKMSDecryption)(config, privateDataKey, {})];
+                return [4 /*yield*/, exports.processKMSDecryption(config, privateDataKey, {})];
             case 1:
                 plainTextData = _a.sent();
                 if (plainTextData.status === "FAILED") {
@@ -251,13 +251,13 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
                 response = null;
                 if (!encrypt) return [3 /*break*/, 3];
                 console.log("Encrypting");
-                return [4 /*yield*/, (0, crypt_1.encryptData)(data, publicKey)];
+                return [4 /*yield*/, crypt_1.encryptData(data, publicKey)];
             case 2:
                 response = _a.sent();
                 return [3 /*break*/, 5];
             case 3:
                 console.log("Decrypting");
-                return [4 /*yield*/, (0, crypt_1.decryptData)(data, publicKey)];
+                return [4 /*yield*/, crypt_1.decryptData(data, publicKey)];
             case 4:
                 response = _a.sent();
                 _a.label = 5;
@@ -270,7 +270,7 @@ var cryptFile = function (filePath, encryption, decrypt) { return __awaiter(void
     var data;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, file_1.processFileEncryptionDecryption)(filePath, encryption, decrypt)];
+            case 0: return [4 /*yield*/, file_1.processFileEncryptionDecryption(filePath, encryption, decrypt)];
             case 1:
                 data = _a.sent();
                 return [2 /*return*/, data];

package/build/encryption/model.d.ts

@@ -1,9 +1,9 @@
-export type AwsConfig = {
+export declare type AwsConfig = {
     accessKeyId: string;
     secretAccessKey: string;
     region: string;
 };
-export type Encryption = {
+export declare type Encryption = {
     encryptionType: string;
     algorithm: string;
     dataKey: string;

package/build/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/middlewares/error-logger.js

@@ -32,16 +32,16 @@ var errorLogger = function (err, req, res, next) {
     var originalUrl = req.originalUrl, method = req.method, body = req.body, params = req.params, query = req.query, db = req.db, projectName = req.projectName, projectId = req.projectId, ip = req.ip;
     var PreviouseFilePath;
     if (projectName) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat() + "/output";
+        PreviouseFilePath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
     }
     else if (projectId) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat() + "/output";
+        PreviouseFilePath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
     }
     else {
-        loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat() + "/output";
+        PreviouseFilePath = loggerPath + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
     }
     if (fs_1.default.existsSync(PreviouseFilePath)) {
         fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });

package/build/middlewares/interceptor-logger-new.js

@@ -27,16 +27,16 @@ var interceptLoggerNew = function (req, res, next) {
     }
     var PreviouseFilePath;
     if (projectName) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat() + "/output";
+        PreviouseFilePath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
     }
     else if (projectId) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat() + "/output";
+        PreviouseFilePath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
     }
     else {
-        loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat() + "/output";
+        PreviouseFilePath = loggerPath + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
     }
     if (fs_1.default.existsSync(PreviouseFilePath)) {
         fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });

package/build/middlewares/interceptor-logger.js

@@ -21,13 +21,13 @@ var interceptLogger = function (req, res, next) {
         reqObject["dbName"] = db.name;
     }
     if (projectName) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)());
+        loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat();
     }
     else if (projectId) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)());
+        loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat();
     }
     else {
-        loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)());
+        loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat();
     }
     var logger = new drapcode_logger_1.FileLogger(loggerPath).createLogger();
     var oldSend = res.send;

package/build/middlewares/redis/request-log.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -47,7 +47,7 @@ var saveRequest = function (req, res) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    req.body = (0, util_1.isEmpty)(req.body) ? req.query : req.body;
+                    req.body = util_1.isEmpty(req.body) ? req.query : req.body;
                     ip = req.headers["x-forwarded-for"] ||
                         req.connection.remoteAddress ||
                         req.socket.remoteAddress ||
@@ -62,13 +62,13 @@ var saveRequest = function (req, res) {
                         response: JSON.stringify(res),
                         ipAddress: ip,
                     };
-                    return [4 /*yield*/, (0, drapcode_redis_1.redis_get_method)("requestLog")];
+                    return [4 /*yield*/, drapcode_redis_1.redis_get_method("requestLog")];
                 case 1:
                     redisData = _a.sent();
                     if (!redisData)
                         redisData = [];
                     redisData.push(respObj);
-                    return [4 /*yield*/, (0, drapcode_redis_1.redis_set_method)("requestLog", redisData)];
+                    return [4 /*yield*/, drapcode_redis_1.redis_set_method("requestLog", redisData)];
                 case 2:
                     _a.sent();
                     return [2 /*return*/];

package/build/utils/check-error.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -35,14 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -118,7 +114,7 @@ var handleMultErrorConfig = function (error, result, status) {
     var apiErrorMessage;
     var apiErrorValue;
     if (result && result !== "undefined" && result !== "null") {
-        console.log("handleMultErrorConfig result :>> ".concat(Object.keys(result)));
+        console.log("handleMultErrorConfig result :>> " + Object.keys(result));
         apiErrorMessage = lodash_1.default.get(result, message);
         if (apiErrorMessage) {
             console.log("*** utility 3 ***");
@@ -148,7 +144,7 @@ var handleMultErrorConfig = function (error, result, status) {
         apiErrorValue = status;
     }
     console.log("apiErrorValue", apiErrorValue);
-    apiErrorValue = "".concat(apiErrorValue);
+    apiErrorValue = "" + apiErrorValue;
     console.log("apiErrorMessage", apiErrorMessage);
     console.log("apiErrorValue", apiErrorValue);
     if (value && apiErrorValue == value) {
@@ -185,7 +181,7 @@ var nestedValue = function (data, messages) {
             messages.push(value);
         }
         else if (Array.isArray(value)) {
-            messages = __spreadArray(__spreadArray([], messages, true), value, true);
+            messages = __spreadArray(__spreadArray([], messages), value);
         }
         else {
             if (Object.keys(value).length) {

package/build/utils/date-util.js

@@ -29,11 +29,11 @@ exports.createLogsDateFormat = createLogsDateFormat;
 var getDateValue = function (value, timezone) {
     if (timezone === void 0) { timezone = ""; }
     if (!value)
-        return (0, exports.createLogsDateFormat)(timezone);
+        return exports.createLogsDateFormat(timezone);
     var dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
     var _a = value.split(":"), type = _a[0], number = _a[1], unit = _a[2];
     if (!["ADD", "SUB"].includes(type))
-        return (0, exports.createLogsDateFormat)(timezone);
+        return exports.createLogsDateFormat(timezone);
     var dateUnit = getDateUnit(unit);
     var result;
     if (type === "ADD") {
@@ -80,7 +80,7 @@ var timezoneDateParse = function (value, nextDay, prevDay) {
     if (prevDay && value.length <= 10) {
         timeZoneDate = timeZoneDate.subtract(1, "days");
     }
-    console.log("If it was for end date ".concat(nextDay, " then"), timeZoneDate);
+    console.log("If it was for end date " + nextDay + " then", timeZoneDate);
     timeZoneDate = timeZoneDate.format("YYYY-MM-DDTHH:mm:ss");
     console.log("Format Date into date string", timeZoneDate);
     return new Date(timeZoneDate);

package/build/utils/query-parser.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -35,14 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -89,7 +85,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         searchQueryObj = null;
                         if (searchObj) {
                             _a = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
-                            aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
+                            aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
                             console.log("likeQuery after getSearchObjQuery", JSON.stringify(likeQuery));
                             if (likeQuery && likeQuery.length > 0) {
                                 searchQueryObj = likeQuery;
@@ -107,7 +103,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     else if (searchObj) {
                         console.log("I donot have filter query");
                         _b = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _b.searchAggregateQuery, likeQuery = _b.likeQuery;
-                        aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
+                        aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
                         if (likeQuery.length) {
                             // aggregateQuery.push({ $match: { $or: likeQuery } });
                             aggregateQuery.push({ $match: { $and: likeQuery } });
@@ -206,7 +202,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     _e.sent();
                     _e.label = 2;
                 case 2:
-                    if (finder != "COUNT" && !(0, util_1.isEmpty)(projection)) {
+                    if (finder != "COUNT" && !util_1.isEmpty(projection)) {
                         aggregateQuery.push({ $project: projection });
                     }
                     if (finder === "COUNT") {
@@ -227,8 +223,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     }
                     console.log("==> aggregateQuery", aggregateQuery);
                     console.log("==> aggregateQuery", JSON.stringify(aggregateQuery));
-                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
-                    str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
+                    queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
+                    str = "req.db.collection('" + collectionName + "')" + queryStr;
                     str += ".toArray()";
                     return [2 /*return*/, str];
             }
@@ -268,7 +264,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
                 filterQuery[lastKey].push(mongoQuery);
             }
             else {
-                filterQuery["$or".concat(index)] = [mongoQuery];
+                filterQuery["$or" + index] = [mongoQuery];
             }
         }
         else if (queryObj.conjunctionType == "AND") {
@@ -277,11 +273,11 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
                 filterQuery[lastKey].push(mongoQuery);
             }
             else {
-                filterQuery["$and".concat(index)] = [mongoQuery];
+                filterQuery["$and" + index] = [mongoQuery];
             }
         }
         else {
-            filterQuery["$or".concat(index)] = [mongoQuery];
+            filterQuery["$or" + index] = [mongoQuery];
         }
     });
     console.log("==> *** filterQuery mongoFilterQuery :>> ", filterQuery);
@@ -300,13 +296,13 @@ var mongoSelectQuery = function (query) {
     if (fieldsInclude[0] === "*") {
         fieldsExclude.map(function (field) {
             if (field)
-                return (projection["".concat(field)] = 0);
+                return (projection["" + field] = 0);
         });
     }
     else {
         fieldsInclude.map(function (field) {
             if (field)
-                return (projection["".concat(field)] = 1);
+                return (projection["" + field] = 1);
         });
     }
     return projection;
@@ -338,7 +334,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         //TODO: In case of this, we assign some random string to avoid resulting all values
         //TODO: This is use case in Spot Factor Project, where a new user with blank value able to see all records
         //TODO: Discussed on meet
-        fieldValue = "random_string_since_field_not_present_".concat((0, moment_1.default)(1318874398806).valueOf());
+        fieldValue = "random_string_since_field_not_present_" + moment_1.default(1318874398806).valueOf();
     }
     console.log("fieldValue queryToMongo 1", fieldValue);
     var isDate = checkDate(fieldValue);
@@ -406,7 +402,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         return _q = {},
             _q[field] = {
                 $gte: fieldValue,
-                $lt: (0, date_util_1.nextDayDate)(fieldValue),
+                $lt: date_util_1.nextDayDate(fieldValue),
             },
             _q;
         // Todo: Remove this if works properly
@@ -446,11 +442,12 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         };
     if (key == drapcode_constant_1.EQUALS) {
         return _x = {},
+            // TODO:Handle Based of Field Type
             _x[field] = fieldType === "boolean" && fieldValue
                 ? JSON.parse(fieldValue)
-                : !isNaN(fieldValue)
-                    ? +fieldValue
-                    : fieldValue,
+                : // : !isNaN(fieldValue)
+                    // ? +fieldValue
+                    fieldValue,
             _x;
     }
     if (key == drapcode_constant_1.NOT_EQUAL)
@@ -462,7 +459,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
             },
             _y;
     if (key == drapcode_constant_1.BETWEEN) {
-        var _0 = (0, exports.getMinMaxValue)(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
+        var _0 = exports.getMinMaxValue(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
         return _z = {},
             _z[field] = {
                 $gte: isInteger ? +startValue : startValue,
@@ -512,13 +509,13 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         return valueList_1;
     }
     if (key === drapcode_constant_1.BETWEEN) {
-        var _a = (0, exports.getMinMaxValue)(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
+        var _a = exports.getMinMaxValue(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
         if (requiredExternal) {
-            startValue_1 = "".concat(externalParams[startValue_1]);
-            endValue_1 = "".concat(externalParams[endValue_1]);
+            startValue_1 = "" + externalParams[startValue_1];
+            endValue_1 = "" + externalParams[endValue_1];
         }
         else {
-            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser, timezone);
@@ -526,7 +523,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser, timezone);
             }
             else {
@@ -542,10 +539,10 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         }
         //TODO: Need to figure out the params should be treated as number/string
         if (!isNaN(startValue_1)) {
-            return "".concat(startValue_1, "---").concat(endValue_1, "^");
+            return startValue_1 + "---" + endValue_1 + "^";
         }
         else
-            return "".concat(startValue_1, "---").concat(endValue_1);
+            return startValue_1 + "---" + endValue_1;
     }
     console.log("==> value", value);
     console.log("==> currentUser", currentUser);
@@ -641,18 +638,19 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
         return getValueOfProjectConstant(value, {}, timezone);
     }
-    if ((0, exports.isEntityInCondition)(value)) {
+    if (exports.isEntityInCondition(value)) {
         var key_1 = value.replace("ENTITY::", "");
         return externalParams[key_1] ? externalParams[key_1] : "";
     }
     //TODO: This is just to confirm if external then it should be get from externalParams
     if (requiredExternal) {
         //TODO: Value returns from here undefined.
-        var externalParamValue = externalParams["".concat(value)];
-        if (!isNaN(externalParamValue)) {
-            return +externalParamValue;
-        }
-        return externalParams["".concat(value)];
+        var externalParamValue = externalParams["" + value];
+        // TODO:Handle Based of Field Type
+        // if (!isNaN(externalParamValue)) {
+        //   return +externalParamValue;
+        // }
+        return externalParams["" + value];
     }
     var constantArr = constants.filter(function (constant) { return constant.name == value; });
     return constantArr.length ? "" + constantArr[0].value : "";
@@ -683,11 +681,11 @@ var getValueOfProjectConstant = function (value, currentUser, timezone) {
     if (value === drapcode_constant_1.CURRENT_USER)
         return currentUser["uuid"];
     if (value === drapcode_constant_1.CURRENT_DATE)
-        result = (0, date_util_1.createLoggerDateFormat)(timezone);
+        result = date_util_1.createLoggerDateFormat(timezone);
     if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
-        result = (0, date_util_1.createLogsDateFormat)(timezone);
+        result = date_util_1.createLogsDateFormat(timezone);
     if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
-        result = (0, date_util_1.getDateValue)(value, timezone);
+        result = date_util_1.getDateValue(value, timezone);
     return result;
 };
 var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
@@ -703,11 +701,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // if input is string and db field type is boolean
                     searchAggregateQuery.push({
                         $addFields: (_b = {},
-                            _b["_".concat(key)] = "$".concat(key),
+                            _b["_" + key] = "$" + key,
                             _b),
                     });
                     likeQuery.push((_c = {},
-                        _c["_".concat(key)] = toBoolean(value),
+                        _c["_" + key] = toBoolean(value),
                         _c));
                 }
                 else if ([
@@ -719,22 +717,22 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // if input is string and db field type is array
                     searchAggregateQuery.push({
                         $addFields: (_d = {},
-                            _d["_".concat(key)] = "$".concat(key),
+                            _d["_" + key] = "$" + key,
                             _d),
                     });
                     likeQuery.push((_e = {},
-                        _e["_".concat(key)] = { $all: [value] },
+                        _e["_" + key] = { $all: [value] },
                         _e));
                 }
                 else if (searchQueryTypeKey === "tel") {
                     // handling value when db field type is tel
                     searchAggregateQuery.push({
                         $addFields: (_f = {},
-                            _f["_".concat(key)] = { $toString: "$".concat(key) },
+                            _f["_" + key] = { $toString: "$" + key },
                             _f),
                     });
                     likeQuery.push((_g = {},
-                        _g["_".concat(key)] = {
+                        _g["_" + key] = {
                             $regex: value.startsWith("+") ? value.replace("+", "") : value,
                             $options: "i",
                         },
@@ -744,11 +742,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // handling value when db field type is Double/Int
                     searchAggregateQuery.push({
                         $addFields: (_h = {},
-                            _h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
+                            _h["_" + key] = { $toString: { $toLong: "$" + key } },
                             _h),
                     });
                     likeQuery.push((_j = {},
-                        _j["_".concat(key)] = {
+                        _j["_" + key] = {
                             $regex: value,
                             $options: "i",
                         },
@@ -760,20 +758,20 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                         fieldKey = fieldKey.replace("end_", "");
                         searchAggregateQuery.push({
                             $addFields: (_k = {},
-                                _k["_".concat(key)] = { $toString: "$".concat(fieldKey) },
+                                _k["_" + key] = { $toString: "$" + fieldKey },
                                 _k),
                         });
                         if (key.startsWith("start_")) {
                             likeQuery.push((_l = {},
-                                _l["_".concat(key)] = {
-                                    $gte: (0, date_util_1.timezoneDateParse)(value, false, true),
+                                _l["_" + key] = {
+                                    $gte: date_util_1.timezoneDateParse(value, false, true),
                                 },
                                 _l));
                         }
                         else if (key.startsWith("end_")) {
                             likeQuery.push((_m = {},
-                                _m["_".concat(key)] = {
-                                    $lt: (0, date_util_1.timezoneDateParse)(value, true),
+                                _m["_" + key] = {
+                                    $lt: date_util_1.timezoneDateParse(value, true),
                                 },
                                 _m));
                         }
@@ -784,11 +782,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                     // converting db field to string first
                     searchAggregateQuery.push({
                         $addFields: (_o = {},
-                            _o["_".concat(key)] = { $toString: "$".concat(key) },
+                            _o["_" + key] = { $toString: "$" + key },
                             _o),
                     });
                     likeQuery.push((_p = {},
-                        _p["_".concat(key)] = {
+                        _p["_" + key] = {
                             $regex: value,
                             $options: "i",
                         },

package/build/utils/query-paser-new.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -35,14 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryParserNew = void 0;
@@ -85,11 +81,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                     if (searchQueryTypeObj[key]) {
                                         aggregateQuery.push({
                                             $addFields: (_b = {},
-                                                _b["_".concat(key)] = { $toString: "$".concat(key) },
+                                                _b["_" + key] = { $toString: "$" + key },
                                                 _b),
                                         });
                                         searchQueryObj_1.push((_c = {},
-                                            _c["_".concat(key)] = {
+                                            _c["_" + key] = {
                                                 $regex: value,
                                                 $options: "i",
                                             },
@@ -123,11 +119,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                         // if input is string and db field type is boolean
                                         aggregateQuery.push({
                                             $addFields: (_b = {},
-                                                _b["_".concat(key)] = "$".concat(key),
+                                                _b["_" + key] = "$" + key,
                                                 _b),
                                         });
                                         likeQuery_1.push((_c = {},
-                                            _c["_".concat(key)] = toBoolean(value),
+                                            _c["_" + key] = toBoolean(value),
                                             _c));
                                     }
                                     else if ([
@@ -139,22 +135,22 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                         // if input is string and db field type is array
                                         aggregateQuery.push({
                                             $addFields: (_d = {},
-                                                _d["_".concat(key)] = "$".concat(key),
+                                                _d["_" + key] = "$" + key,
                                                 _d),
                                         });
                                         likeQuery_1.push((_e = {},
-                                            _e["_".concat(key)] = { $all: [value] },
+                                            _e["_" + key] = { $all: [value] },
                                             _e));
                                     }
                                     else if (searchQueryTypeObj[key] === "tel") {
                                         // handling value when db field type is tel
                                         aggregateQuery.push({
                                             $addFields: (_f = {},
-                                                _f["_".concat(key)] = { $toString: "$".concat(key) },
+                                                _f["_" + key] = { $toString: "$" + key },
                                                 _f),
                                         });
                                         likeQuery_1.push((_g = {},
-                                            _g["_".concat(key)] = {
+                                            _g["_" + key] = {
                                                 $regex: value.startsWith("+") ? value.replace("+", "") : value,
                                                 $options: "i",
                                             },
@@ -164,11 +160,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                         // handling value when db field type is Double/Int
                                         aggregateQuery.push({
                                             $addFields: (_h = {},
-                                                _h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
+                                                _h["_" + key] = { $toString: { $toLong: "$" + key } },
                                                 _h),
                                         });
                                         likeQuery_1.push((_j = {},
-                                            _j["_".concat(key)] = {
+                                            _j["_" + key] = {
                                                 $regex: value,
                                                 $options: "i",
                                             },
@@ -179,11 +175,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                         // converting db field to string first
                                         aggregateQuery.push({
                                             $addFields: (_k = {},
-                                                _k["_".concat(key)] = { $toString: "$".concat(key) },
+                                                _k["_" + key] = { $toString: "$" + key },
                                                 _k),
                                         });
                                         likeQuery_1.push((_l = {},
-                                            _l["_".concat(key)] = {
+                                            _l["_" + key] = {
                                                 $regex: value,
                                                 $options: "i",
                                             },
@@ -297,7 +293,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     _b.label = 2;
                 case 2:
                     if (!["COUNT", "SUM", "AVG", "MIN", "MAX"].includes(finder) &&
-                        !(0, util_1.isEmpty)(projection)) {
+                        !util_1.isEmpty(projection)) {
                         aggregateQuery.push({ $project: projection });
                     }
                     if (finder === "COUNT") {
@@ -305,22 +301,22 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     }
                     else if (finder === "SUM") {
                         aggregateQuery.push({
-                            $group: { _id: null, total: { $sum: "$".concat(aggregateFunctionField) } },
+                            $group: { _id: null, total: { $sum: "$" + aggregateFunctionField } },
                         });
                     }
                     else if (finder === "AVG") {
                         aggregateQuery.push({
-                            $group: { _id: null, average: { $avg: "$".concat(aggregateFunctionField) } },
+                            $group: { _id: null, average: { $avg: "$" + aggregateFunctionField } },
                         });
                     }
                     else if (finder === "MIN") {
                         aggregateQuery.push({
-                            $group: { _id: null, minimum: { $min: "$".concat(aggregateFunctionField) } },
+                            $group: { _id: null, minimum: { $min: "$" + aggregateFunctionField } },
                         });
                     }
                     else if (finder === "MAX") {
                         aggregateQuery.push({
-                            $group: { _id: null, maximum: { $max: "$".concat(aggregateFunctionField) } },
+                            $group: { _id: null, maximum: { $max: "$" + aggregateFunctionField } },
                         });
                     }
                     offset = externalParams.offset || 0;
@@ -336,8 +332,8 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
                     }
-                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
-                    str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
+                    queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
+                    str = "req.db.collection('" + collectionName + "')" + queryStr;
                     str += ".toArray()";
                     return [2 /*return*/, str];
             }
@@ -374,7 +370,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser)
                 filterQuery[lastKey].push(mongoQuery);
             }
             else {
-                filterQuery["$or".concat(index)] = [mongoQuery];
+                filterQuery["$or" + index] = [mongoQuery];
             }
         }
         else if (queryObj.conjunctionType == "AND") {
@@ -383,11 +379,11 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser)
                 filterQuery[lastKey].push(mongoQuery);
             }
             else {
-                filterQuery["$and".concat(index)] = [mongoQuery];
+                filterQuery["$and" + index] = [mongoQuery];
             }
         }
         else {
-            filterQuery["$or".concat(index)] = [mongoQuery];
+            filterQuery["$or" + index] = [mongoQuery];
         }
     });
     console.log("==> *** filterQuery #2 :>> ", filterQuery);
@@ -403,13 +399,13 @@ var mongoSelectQuery = function (query) {
     if (fieldsInclude[0] === "*") {
         fieldsExclude.map(function (field) {
             if (field)
-                return (projection["".concat(field)] = 0);
+                return (projection["" + field] = 0);
         });
     }
     else {
         fieldsInclude.map(function (field) {
             if (field)
-                return (projection["".concat(field)] = 1);
+                return (projection["" + field] = 1);
         });
     }
     return projection;
@@ -500,7 +496,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
             return _r = {},
                 _r[field] = {
                     $gte: fieldValue,
-                    $lt: new Date((0, date_util_1.nextDayDate)(fieldValue)),
+                    $lt: new Date(date_util_1.nextDayDate(fieldValue)),
                 },
                 _r;
     }
@@ -524,11 +520,12 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
         };
     if (key == drapcode_constant_1.EQUALS)
         return _y = {},
+            // TODO:Handle Based of Field Type
             _y[field] = fieldType === "boolean" && fieldValue
                 ? JSON.parse(fieldValue)
-                : !isNaN(fieldValue)
-                    ? +fieldValue
-                    : fieldValue,
+                : // : !isNaN(fieldValue)
+                    // ? +fieldValue
+                    fieldValue,
             _y;
     if (key == drapcode_constant_1.NOT_EQUAL)
         return _z = {},
@@ -578,11 +575,11 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     if (key === drapcode_constant_1.BETWEEN) {
         var _a = getMinMaxValue(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
         if (requiredExternal) {
-            startValue_1 = "".concat(externalParams[startValue_1]);
-            endValue_1 = "".concat(externalParams[endValue_1]);
+            startValue_1 = "" + externalParams[startValue_1];
+            endValue_1 = "" + externalParams[endValue_1];
         }
         else {
-            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
@@ -590,7 +587,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
             else {
                 startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
             }
-            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
             }
             else {
@@ -607,10 +604,10 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         //TODO: Need to figure out the params should be treated as number/string
         if (!isNaN(startValue_1)) {
             console.log("I am Number");
-            return "".concat(startValue_1, "---").concat(endValue_1, "^");
+            return startValue_1 + "---" + endValue_1 + "^";
         }
         else
-            return "".concat(startValue_1, "---").concat(endValue_1);
+            return startValue_1 + "---" + endValue_1;
     }
     if (value.includes(drapcode_constant_1.CURRENT_USER)) {
         if (value === drapcode_constant_1.CURRENT_USER) {
@@ -648,11 +645,12 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
     //TODO: This is just to confirm if external then it should be get from externalParams
     if (requiredExternal) {
         //TODO: Value returns from here undefined.
-        var externalParamValue = externalParams["".concat(value)];
-        if (!isNaN(externalParamValue)) {
-            return +externalParamValue;
-        }
-        return externalParams["".concat(value)];
+        var externalParamValue = externalParams["" + value];
+        // TODO:Handle Based of Field Type
+        // if (!isNaN(externalParamValue)) {
+        //   return +externalParamValue;
+        // }
+        return externalParams["" + value];
     }
     var constantArr = constants.filter(function (constant) { return constant.name == value; });
     return constantArr.length ? "" + constantArr[0].value : "";
@@ -679,9 +677,9 @@ var getValueOfProjectConstant = function (value, currentUser) {
     if (value === drapcode_constant_1.CURRENT_USER)
         return currentUser["uuid"];
     if (value === drapcode_constant_1.CURRENT_DATE)
-        return (0, date_util_1.createLoggerDateFormat)();
+        return date_util_1.createLoggerDateFormat();
     if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
-        return (0, date_util_1.createLogsDateFormat)();
+        return date_util_1.createLogsDateFormat();
     if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
-        return (0, date_util_1.getDateValue)(value);
+        return date_util_1.getDateValue(value);
 };

package/build/utils/s3-util.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -75,9 +75,9 @@ exports.createS3Client = createS3Client;
 var fileUploadToS3 = function (files, s3Client, s3Config, encryption, options) {
     if (options === void 0) { options = {}; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var awsConfig, encryptionType, dataKey, accessKeyId, secretAccessKey, region, config, plainTextData, fileOptions, s3Key, _a, _b, _c, _i, index, file, fileObj, fileObj;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var awsConfig, encryptionType, dataKey, accessKeyId, secretAccessKey, region, config, plainTextData, fileOptions, s3Key, _a, _b, _i, index, file, fileObj, fileObj;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     if (!encryption) return [3 /*break*/, 2];
                     awsConfig = encryption.awsConfig, encryptionType = encryption.encryptionType, dataKey = encryption.dataKey;
@@ -88,41 +88,38 @@ var fileUploadToS3 = function (files, s3Client, s3Config, encryption, options) {
                         accessKeyId: accessKeyId,
                         secretAccessKey: secretAccessKey,
                     };
-                    return [4 /*yield*/, (0, encryption_2.processKMSDecryption)(config, dataKey, {})];
+                    return [4 /*yield*/, encryption_2.processKMSDecryption(config, dataKey, {})];
                 case 1:
-                    plainTextData = _d.sent();
+                    plainTextData = _c.sent();
                     if (plainTextData.status === "FAILED") {
                         return [2 /*return*/, plainTextData];
                     }
                     encryption.dataKey = plainTextData.data;
-                    _d.label = 2;
+                    _c.label = 2;
                 case 2:
                     if (!Array.isArray(files)) return [3 /*break*/, 7];
                     console.log("I have multiple file");
                     fileOptions = [];
                     s3Key = s3Config.key;
-                    _a = files;
-                    _b = [];
-                    for (_c in _a)
-                        _b.push(_c);
+                    _a = [];
+                    for (_b in files)
+                        _a.push(_b);
                     _i = 0;
-                    _d.label = 3;
+                    _c.label = 3;
                 case 3:
-                    if (!(_i < _b.length)) return [3 /*break*/, 6];
-                    _c = _b[_i];
-                    if (!(_c in _a)) return [3 /*break*/, 5];
-                    index = _c;
+                    if (!(_i < _a.length)) return [3 /*break*/, 6];
+                    index = _a[_i];
                     file = files[index];
                     if (s3Config.append) {
-                        s3Config.key = "".concat(s3Key, "/").concat(file.originalname);
+                        s3Config.key = s3Key + "/" + file.originalname;
                     }
                     return [4 /*yield*/, processFileUploadToS3(file, s3Client, s3Config, encryption, options, encryption ? true : false)];
                 case 4:
-                    fileObj = _d.sent();
+                    fileObj = _c.sent();
                     if (fileObj) {
                         fileOptions.push(fileObj);
                     }
-                    _d.label = 5;
+                    _c.label = 5;
                 case 5:
                     _i++;
                     return [3 /*break*/, 3];
@@ -130,11 +127,11 @@ var fileUploadToS3 = function (files, s3Client, s3Config, encryption, options) {
                 case 7:
                     console.log("I have single file");
                     if (s3Config.append) {
-                        s3Config.key = "".concat(s3Config.key, "/").concat(files.originalname);
+                        s3Config.key = s3Config.key + "/" + files.originalname;
                     }
                     return [4 /*yield*/, processFileUploadToS3(files, s3Client, s3Config, encryption, options, encryption ? true : false)];
                 case 8:
-                    fileObj = _d.sent();
+                    fileObj = _c.sent();
                     return [2 /*return*/, fileObj];
             }
         });
@@ -154,7 +151,7 @@ var processFileUploadToS3 = function (file, s3Client, s3Config, encryption, opti
                     acl = s3Config.acl, key = s3Config.key, bucket = s3Config.bucket;
                     params = null;
                     if (!encrypt) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (0, encryption_1.cryptFile)(file.path, encryption, false)];
+                    return [4 /*yield*/, encryption_1.cryptFile(file.path, encryption, false)];
                 case 1:
                     encryptedBody = _a.sent();
                     params = __assign({ Bucket: bucket, ACL: acl, Key: key, 

package/build/utils/util.d.ts

@@ -1,6 +1,6 @@
 export declare const validateString: (str: string) => false | "String should not contain special characters" | "String should not contain any number";
 export declare const camelize: (str: string) => string;
-export declare const clearSpaceAndReformat: (text: string, separator?: string) => string;
+export declare const clearSpaceAndReformat: (text: string, separator?: string | undefined) => string;
 export declare const isEmpty: (obj: any) => boolean;
 export declare const isEmptyObject: (object: any) => boolean;
 export declare const isObject: (item: any) => any;

package/build/utils/util.js

@@ -38,7 +38,7 @@ var validateString = function (str) {
 };
 exports.validateString = validateString;
 var camelize = function (str) {
-    str = (0, exports.clearSpaceAndReformat)(str);
+    str = exports.clearSpaceAndReformat(str);
     return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
         return index === 0 ? word.toLowerCase() : word.toUpperCase();
     });
@@ -165,8 +165,8 @@ var cleanCollectionAndFieldName = function (str) {
 };
 exports.cleanCollectionAndFieldName = cleanCollectionAndFieldName;
 var formatCollectionAndFieldName = function (str) {
-    var updateString = (0, exports.cleanCollectionAndFieldName)(str);
-    return (0, exports.clearSpaceAndReformat)(updateString.trim(), "_");
+    var updateString = exports.cleanCollectionAndFieldName(str);
+    return exports.clearSpaceAndReformat(updateString.trim(), "_");
 };
 exports.formatCollectionAndFieldName = formatCollectionAndFieldName;
 var restructureData = function (data) {
@@ -197,7 +197,7 @@ var restructureData = function (data) {
 exports.restructureData = restructureData;
 var checkAndCompareValue = function (input1, input2) {
     return Array.isArray(input2)
-        ? (0, exports.arraysEqual)(input1, input2.map(function (key) { return key.value; }))
+        ? exports.arraysEqual(input1, input2.map(function (key) { return key.value; }))
         : input1 === input2.value;
 };
 exports.checkAndCompareValue = checkAndCompareValue;
@@ -207,7 +207,7 @@ var arraysEqual = function (array1, array2) {
             return false;
         for (var i = 0; i < array1.length; i++ // assert each element equal
         )
-            if (!(0, exports.arraysEqual)(array1[i], array2[i]))
+            if (!exports.arraysEqual(array1[i], array2[i]))
                 return false;
         return true;
     }
@@ -242,7 +242,7 @@ var formatCustomCSSClasses = function (projectCustomCSSClasses) {
                 .replace(/"([^"]+)"/g, "$1")
                 .split(",")
                 .join(";");
-            projectCustomCSSClassesData += "".concat(element.class.startsWith(".") ? element.class : "." + element.class).concat(element.pseudoClass ? ":" + element.pseudoClass : "").concat(unquotedClassWithProp, " ");
+            projectCustomCSSClassesData += "" + (element.class.startsWith(".") ? element.class : "." + element.class) + (element.pseudoClass ? ":" + element.pseudoClass : "") + unquotedClassWithProp + " ";
         }
     });
     return projectCustomCSSClassesData;
@@ -253,18 +253,18 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, s
     var contentList = (_a = expression
         .match(/{{(.*?)}}/g)) === null || _a === void 0 ? void 0 : _a.map(function (b) { return b.replace(/{{(.*?)}}/g, "$1"); });
     contentList === null || contentList === void 0 ? void 0 : contentList.forEach(function (prop) {
-        var needle = "{{".concat(prop, "}}");
+        var needle = "{{" + prop + "}}";
         var dataOfItem = "";
         if (prop.includes("current_user")) {
             prop = prop.replace("current_user.", "");
             if (Object.keys(user).length > 0) {
-                dataOfItem = (0, exports.parseValueFromData)(user, prop);
+                dataOfItem = exports.parseValueFromData(user, prop);
             }
         }
         else if (prop.includes("current_tenant")) {
             prop = prop.replace("current_tenant.", "");
             if (Object.keys(tenant).length > 0) {
-                dataOfItem = (0, exports.parseValueFromData)(tenant, prop);
+                dataOfItem = exports.parseValueFromData(tenant, prop);
             }
         }
         else if (prop.includes("current_session")) {
@@ -290,7 +290,7 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, s
         }
         else {
             if (Object.keys(data).length > 0) {
-                dataOfItem = (0, exports.parseValueFromData)(data, prop);
+                dataOfItem = exports.parseValueFromData(data, prop);
                 //TODO: Need better way
                 delete data[prop];
             }
@@ -390,7 +390,7 @@ var replaceTransferObjectValueIntoExpression = function (expression, transferObj
         var contentList = (_a = expression
             .match(/{{(.*?)}}/g)) === null || _a === void 0 ? void 0 : _a.map(function (b) { return b.replace(/{{(.*?)}}/g, "$1"); });
         contentList === null || contentList === void 0 ? void 0 : contentList.forEach(function (prop) {
-            var needle = "{{".concat(prop, "}}");
+            var needle = "{{" + prop + "}}";
             var dataOfItem = "";
             dataOfItem = transferObject[prop] ? transferObject[prop] : "";
             expression = dataOfItem

package/build/utils/uuid-generator.js

@@ -38,10 +38,10 @@ var nextGeneratedString = function (str, prepend, minLength, append, algorithm)
         finalValue = voca_1.default.padLeft(finalValue, minLength, "0");
     }
     if (prepend) {
-        finalValue = "".concat(prepend).concat(finalValue);
+        finalValue = "" + prepend + finalValue;
     }
     if (append) {
-        finalValue = "".concat(finalValue).concat(append);
+        finalValue = "" + finalValue + append;
     }
     return finalValue;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.2.1-beta",
+  "version": "1.2.2-beta",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",