drapcode-utility 1.2.2 → 1.2.3

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 (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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,10 +35,14 @@ 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) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+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));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryParserNew = void 0;
@@ -81,11 +85,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                     if (searchQueryTypeObj[key]) {
                                         aggregateQuery.push({
                                             $addFields: (_b = {},
-                                                _b["_" + key] = { $toString: "$" + key },
+                                                _b["_".concat(key)] = { $toString: "$".concat(key) },
                                                 _b),
                                         });
                                         searchQueryObj_1.push((_c = {},
-                                            _c["_" + key] = {
+                                            _c["_".concat(key)] = {
                                                 $regex: value,
                                                 $options: "i",
                                             },
@@ -119,11 +123,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                         // if input is string and db field type is boolean
                                         aggregateQuery.push({
                                             $addFields: (_b = {},
-                                                _b["_" + key] = "$" + key,
+                                                _b["_".concat(key)] = "$".concat(key),
                                                 _b),
                                         });
                                         likeQuery_1.push((_c = {},
-                                            _c["_" + key] = toBoolean(value),
+                                            _c["_".concat(key)] = toBoolean(value),
                                             _c));
                                     }
                                     else if ([
@@ -135,22 +139,22 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                         // if input is string and db field type is array
                                         aggregateQuery.push({
                                             $addFields: (_d = {},
-                                                _d["_" + key] = "$" + key,
+                                                _d["_".concat(key)] = "$".concat(key),
                                                 _d),
                                         });
                                         likeQuery_1.push((_e = {},
-                                            _e["_" + key] = { $all: [value] },
+                                            _e["_".concat(key)] = { $all: [value] },
                                             _e));
                                     }
                                     else if (searchQueryTypeObj[key] === "tel") {
                                         // handling value when db field type is tel
                                         aggregateQuery.push({
                                             $addFields: (_f = {},
-                                                _f["_" + key] = { $toString: "$" + key },
+                                                _f["_".concat(key)] = { $toString: "$".concat(key) },
                                                 _f),
                                         });
                                         likeQuery_1.push((_g = {},
-                                            _g["_" + key] = {
+                                            _g["_".concat(key)] = {
                                                 $regex: value.startsWith("+") ? value.replace("+", "") : value,
                                                 $options: "i",
                                             },
@@ -160,11 +164,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                         // handling value when db field type is Double/Int
                                         aggregateQuery.push({
                                             $addFields: (_h = {},
-                                                _h["_" + key] = { $toString: { $toLong: "$" + key } },
+                                                _h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
                                                 _h),
                                         });
                                         likeQuery_1.push((_j = {},
-                                            _j["_" + key] = {
+                                            _j["_".concat(key)] = {
                                                 $regex: value,
                                                 $options: "i",
                                             },
@@ -175,11 +179,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                         // converting db field to string first
                                         aggregateQuery.push({
                                             $addFields: (_k = {},
-                                                _k["_" + key] = { $toString: "$" + key },
+                                                _k["_".concat(key)] = { $toString: "$".concat(key) },
                                                 _k),
                                         });
                                         likeQuery_1.push((_l = {},
-                                            _l["_" + key] = {
+                                            _l["_".concat(key)] = {
                                                 $regex: value,
                                                 $options: "i",
                                             },
@@ -214,7 +218,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                     if (field.type === "belongsTo") {
                                         aggregateQuery.push({
                                             $lookup: {
-                                                from: "" + collectionName_1,
+                                                from: "".concat(collectionName_1),
                                                 localField: field.fieldName,
                                                 foreignField: "uuid",
                                                 as: field.fieldName,
@@ -229,8 +233,8 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                     else {
                                         aggregateQuery.push({
                                             $lookup: {
-                                                from: "" + collectionName_1,
-                                                let: (_b = {}, _b["" + field.fieldName] = "$" + field.fieldName, _b),
+                                                from: "".concat(collectionName_1),
+                                                let: (_b = {}, _b["".concat(field.fieldName)] = "$".concat(field.fieldName), _b),
                                                 pipeline: [
                                                     {
                                                         $match: {
@@ -240,10 +244,10 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                                                     {
                                                                         $cond: {
                                                                             if: {
-                                                                                $in: ["$$" + field.fieldName, ["", null]],
+                                                                                $in: ["$$".concat(field.fieldName), ["", null]],
                                                                             },
                                                                             then: [],
-                                                                            else: { $ifNull: ["$$" + field.fieldName, []] },
+                                                                            else: { $ifNull: ["$$".concat(field.fieldName), []] },
                                                                         },
                                                                     },
                                                                 ],
@@ -276,10 +280,10 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                 aggregateQuery.push({
                                     $lookup: {
                                         from: "user",
-                                        let: (_c = {}, _c["" + field.fieldName] = "$" + field.fieldName, _c),
+                                        let: (_c = {}, _c["".concat(field.fieldName)] = "$".concat(field.fieldName), _c),
                                         pipeline: [
                                             {
-                                                $match: { $expr: { $eq: ["$uuid", "$$" + field.fieldName] } },
+                                                $match: { $expr: { $eq: ["$uuid", "$$".concat(field.fieldName)] } },
                                             },
                                             { $project: { _id: 0, password: 0 } },
                                         ],
@@ -292,7 +296,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     _b.label = 2;
                 case 2:
                     if (!["COUNT", "SUM", "AVG", "MIN", "MAX"].includes(finder) &&
-                        !util_1.isEmpty(projection)) {
+                        !(0, util_1.isEmpty)(projection)) {
                         aggregateQuery.push({ $project: projection });
                     }
                     if (finder === "COUNT") {
@@ -300,22 +304,22 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     }
                     else if (finder === "SUM") {
                         aggregateQuery.push({
-                            $group: { _id: null, total: { $sum: "$" + aggregateFunctionField } },
+                            $group: { _id: null, total: { $sum: "$".concat(aggregateFunctionField) } },
                         });
                     }
                     else if (finder === "AVG") {
                         aggregateQuery.push({
-                            $group: { _id: null, average: { $avg: "$" + aggregateFunctionField } },
+                            $group: { _id: null, average: { $avg: "$".concat(aggregateFunctionField) } },
                         });
                     }
                     else if (finder === "MIN") {
                         aggregateQuery.push({
-                            $group: { _id: null, minimum: { $min: "$" + aggregateFunctionField } },
+                            $group: { _id: null, minimum: { $min: "$".concat(aggregateFunctionField) } },
                         });
                     }
                     else if (finder === "MAX") {
                         aggregateQuery.push({
-                            $group: { _id: null, maximum: { $max: "$" + aggregateFunctionField } },
+                            $group: { _id: null, maximum: { $max: "$".concat(aggregateFunctionField) } },
                         });
                     }
                     offset = externalParams.offset || 0;
@@ -331,8 +335,8 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
                     }
-                    queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
-                    str = "req.db.collection('" + collectionName + "')" + queryStr;
+                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
+                    str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
                     str += ".toArray()";
                     return [2 /*return*/, str];
             }
@@ -369,7 +373,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser)
                 filterQuery[lastKey].push(mongoQuery);
             }
             else {
-                filterQuery["$or" + index] = [mongoQuery];
+                filterQuery["$or".concat(index)] = [mongoQuery];
             }
         }
         else if (queryObj.conjunctionType == "AND") {
@@ -378,11 +382,11 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser)
                 filterQuery[lastKey].push(mongoQuery);
             }
             else {
-                filterQuery["$and" + index] = [mongoQuery];
+                filterQuery["$and".concat(index)] = [mongoQuery];
             }
         }
         else {
-            filterQuery["$or" + index] = [mongoQuery];
+            filterQuery["$or".concat(index)] = [mongoQuery];
         }
     });
     console.log("==> *** filterQuery #2 :>> ", filterQuery);
@@ -398,15 +402,15 @@ var mongoSelectQuery = function (query) {
     if (fieldsInclude[0] === "*") {
         fieldsExclude.map(function (field) {
             if (field)
-                return (projection["" + field] = 0);
+                return (projection["".concat(field)] = 0);
         });
     }
     else {
         if (["FIND_ALL", "FIND"].includes(finder))
-            fieldsInclude = util_1.processFieldsInlcude(fieldsInclude);
+            fieldsInclude = (0, util_1.processFieldsInlcude)(fieldsInclude);
         fieldsInclude.map(function (field) {
             if (field)
-                return (projection["" + field] = 1);
+                return (projection["".concat(field)] = 1);
         });
     }
     return projection;
@@ -497,7 +501,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
             return _r = {},
                 _r[field] = {
                     $gte: fieldValue,
-                    $lt: new Date(date_util_1.nextDayDate(fieldValue)),
+                    $lt: new Date((0, date_util_1.nextDayDate)(fieldValue)),
                 },
                 _r;
     }
@@ -575,11 +579,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 = "" + externalParams[startValue_1];
-            endValue_1 = "" + externalParams[endValue_1];
+            startValue_1 = "".concat(externalParams[startValue_1]);
+            endValue_1 = "".concat(externalParams[endValue_1]);
         }
         else {
-            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) {
                 return startValue_1.includes(cnst);
             })) {
                 startValue_1 = getValueOfProjectConstant(startValue_1, currentUser);
@@ -587,7 +591,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).some(function (cnst) { return endValue_1.includes(cnst); })) {
+            if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
                 endValue_1 = getValueOfProjectConstant(endValue_1, currentUser);
             }
             else {
@@ -604,10 +608,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 startValue_1 + "---" + endValue_1 + "^";
+            return "".concat(startValue_1, "---").concat(endValue_1, "^");
         }
         else
-            return startValue_1 + "---" + endValue_1;
+            return "".concat(startValue_1, "---").concat(endValue_1);
     }
     if (value.includes(drapcode_constant_1.CURRENT_USER)) {
         if (value === drapcode_constant_1.CURRENT_USER) {
@@ -645,11 +649,11 @@ 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["" + value];
+        var externalParamValue = externalParams["".concat(value)];
         if (!isNaN(externalParamValue)) {
             return +externalParamValue;
         }
-        return externalParams["" + value];
+        return externalParams["".concat(value)];
     }
     var constantArr = constants.filter(function (constant) { return constant.name == value; });
     return constantArr.length ? "" + constantArr[0].value : "";
@@ -676,9 +680,9 @@ var getValueOfProjectConstant = function (value, currentUser) {
     if (value === drapcode_constant_1.CURRENT_USER)
         return currentUser["uuid"];
     if (value === drapcode_constant_1.CURRENT_DATE)
-        return date_util_1.createLoggerDateFormat();
+        return (0, date_util_1.createLoggerDateFormat)();
     if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
-        return date_util_1.createLogsDateFormat();
+        return (0, date_util_1.createLogsDateFormat)();
     if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
-        return date_util_1.getDateValue(value);
+        return (0, 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 (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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, _i, index, file, fileObj, fileObj;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        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) {
                 case 0:
                     if (!encryption) return [3 /*break*/, 2];
                     awsConfig = encryption.awsConfig, encryptionType = encryption.encryptionType, dataKey = encryption.dataKey;
@@ -88,38 +88,41 @@ var fileUploadToS3 = function (files, s3Client, s3Config, encryption, options) {
                         accessKeyId: accessKeyId,
                         secretAccessKey: secretAccessKey,
                     };
-                    return [4 /*yield*/, encryption_2.processKMSDecryption(config, dataKey, {})];
+                    return [4 /*yield*/, (0, encryption_2.processKMSDecryption)(config, dataKey, {})];
                 case 1:
-                    plainTextData = _c.sent();
+                    plainTextData = _d.sent();
                     if (plainTextData.status === "FAILED") {
                         return [2 /*return*/, plainTextData];
                     }
                     encryption.dataKey = plainTextData.data;
-                    _c.label = 2;
+                    _d.label = 2;
                 case 2:
                     if (!Array.isArray(files)) return [3 /*break*/, 7];
                     console.log("I have multiple file");
                     fileOptions = [];
                     s3Key = s3Config.key;
-                    _a = [];
-                    for (_b in files)
-                        _a.push(_b);
+                    _a = files;
+                    _b = [];
+                    for (_c in _a)
+                        _b.push(_c);
                     _i = 0;
-                    _c.label = 3;
+                    _d.label = 3;
                 case 3:
-                    if (!(_i < _a.length)) return [3 /*break*/, 6];
-                    index = _a[_i];
+                    if (!(_i < _b.length)) return [3 /*break*/, 6];
+                    _c = _b[_i];
+                    if (!(_c in _a)) return [3 /*break*/, 5];
+                    index = _c;
                     file = files[index];
                     if (s3Config.append) {
-                        s3Config.key = s3Key + "/" + file.originalname;
+                        s3Config.key = "".concat(s3Key, "/").concat(file.originalname);
                     }
                     return [4 /*yield*/, processFileUploadToS3(file, s3Client, s3Config, encryption, options, encryption ? true : false)];
                 case 4:
-                    fileObj = _c.sent();
+                    fileObj = _d.sent();
                     if (fileObj) {
                         fileOptions.push(fileObj);
                     }
-                    _c.label = 5;
+                    _d.label = 5;
                 case 5:
                     _i++;
                     return [3 /*break*/, 3];
@@ -127,11 +130,11 @@ var fileUploadToS3 = function (files, s3Client, s3Config, encryption, options) {
                 case 7:
                     console.log("I have single file");
                     if (s3Config.append) {
-                        s3Config.key = s3Config.key + "/" + files.originalname;
+                        s3Config.key = "".concat(s3Config.key, "/").concat(files.originalname);
                     }
                     return [4 /*yield*/, processFileUploadToS3(files, s3Client, s3Config, encryption, options, encryption ? true : false)];
                 case 8:
-                    fileObj = _c.sent();
+                    fileObj = _d.sent();
                     return [2 /*return*/, fileObj];
             }
         });
@@ -151,7 +154,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*/, encryption_1.cryptFile(file.path, encryption, false)];
+                    return [4 /*yield*/, (0, 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 | undefined) => string;
+export declare const clearSpaceAndReformat: (text: string, separator?: string) => 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

@@ -21,10 +21,14 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-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 __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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -43,7 +47,7 @@ var validateString = function (str) {
 };
 exports.validateString = validateString;
 var camelize = function (str) {
-    str = exports.clearSpaceAndReformat(str);
+    str = (0, exports.clearSpaceAndReformat)(str);
     return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
         return index === 0 ? word.toLowerCase() : word.toUpperCase();
     });
@@ -170,8 +174,8 @@ var cleanCollectionAndFieldName = function (str) {
 };
 exports.cleanCollectionAndFieldName = cleanCollectionAndFieldName;
 var formatCollectionAndFieldName = function (str) {
-    var updateString = exports.cleanCollectionAndFieldName(str);
-    return exports.clearSpaceAndReformat(updateString.trim(), "_");
+    var updateString = (0, exports.cleanCollectionAndFieldName)(str);
+    return (0, exports.clearSpaceAndReformat)(updateString.trim(), "_");
 };
 exports.formatCollectionAndFieldName = formatCollectionAndFieldName;
 var restructureData = function (data) {
@@ -202,7 +206,7 @@ var restructureData = function (data) {
 exports.restructureData = restructureData;
 var checkAndCompareValue = function (input1, input2) {
     return Array.isArray(input2)
-        ? exports.arraysEqual(input1, input2.map(function (key) { return key.value; }))
+        ? (0, exports.arraysEqual)(input1, input2.map(function (key) { return key.value; }))
         : input1 === input2.value;
 };
 exports.checkAndCompareValue = checkAndCompareValue;
@@ -212,7 +216,7 @@ var arraysEqual = function (array1, array2) {
             return false;
         for (var i = 0; i < array1.length; i++ // assert each element equal
         )
-            if (!exports.arraysEqual(array1[i], array2[i]))
+            if (!(0, exports.arraysEqual)(array1[i], array2[i]))
                 return false;
         return true;
     }
@@ -247,7 +251,7 @@ var formatCustomCSSClasses = function (projectCustomCSSClasses) {
                 .replace(/"([^"]+)"/g, "$1")
                 .split(",")
                 .join(";");
-            projectCustomCSSClassesData += "" + (element.class.startsWith(".") ? element.class : "." + element.class) + (element.pseudoClass ? ":" + element.pseudoClass : "") + unquotedClassWithProp + " ";
+            projectCustomCSSClassesData += "".concat(element.class.startsWith(".") ? element.class : "." + element.class).concat(element.pseudoClass ? ":" + element.pseudoClass : "").concat(unquotedClassWithProp, " ");
         }
     });
     return projectCustomCSSClassesData;
@@ -258,18 +262,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 = "{{" + prop + "}}";
+        var needle = "{{".concat(prop, "}}");
         var dataOfItem = "";
         if (prop.includes("current_user")) {
             prop = prop.replace("current_user.", "");
             if (Object.keys(user).length > 0) {
-                dataOfItem = exports.parseValueFromData(user, prop);
+                dataOfItem = (0, exports.parseValueFromData)(user, prop);
             }
         }
         else if (prop.includes("current_tenant")) {
             prop = prop.replace("current_tenant.", "");
             if (Object.keys(tenant).length > 0) {
-                dataOfItem = exports.parseValueFromData(tenant, prop);
+                dataOfItem = (0, exports.parseValueFromData)(tenant, prop);
             }
         }
         else if (prop.includes("current_session")) {
@@ -295,7 +299,7 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, s
         }
         else {
             if (Object.keys(data).length > 0) {
-                dataOfItem = exports.parseValueFromData(data, prop);
+                dataOfItem = (0, exports.parseValueFromData)(data, prop);
                 //TODO: Need better way
                 delete data[prop];
             }
@@ -395,7 +399,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 = "{{" + prop + "}}";
+            var needle = "{{".concat(prop, "}}");
             var dataOfItem = "";
             dataOfItem = transferObject[prop] ? transferObject[prop] : "";
             expression = dataOfItem
@@ -470,8 +474,8 @@ var processFieldsInlcude = function (fieldsInclude) {
     fieldsInclude = fieldsInclude.filter(function (field) { return !(field.startsWith("RF::") || field.startsWith("DF::")); });
     var refFields = processReferenceFieldInclude(refFieldsInclude);
     var derivedFields = processDerivedFieldInclude(derivedFieldsInclude);
-    var extraField = __spreadArray(__spreadArray([], refFields), derivedFields).filter(function (value, index, array) { return array.indexOf(value) === index; });
-    result = __spreadArray(__spreadArray([], fieldsInclude), extraField);
+    var extraField = __spreadArray(__spreadArray([], refFields, true), derivedFields, true).filter(function (value, index, array) { return array.indexOf(value) === index; });
+    result = __spreadArray(__spreadArray([], fieldsInclude, true), extraField, true);
     return result;
 };
 exports.processFieldsInlcude = processFieldsInlcude;
@@ -496,16 +500,16 @@ var processDerivedFieldInclude = function (derivedFieldsInclude) {
             if (arg.name === "expression") {
                 var needleList = (_a = arg.key
                     .match(/{{(.*?)}}/g)) === null || _a === void 0 ? void 0 : _a.map(function (b) { return b.replace(/{{(.*?)}}/g, "$1"); });
-                var tempFields = exports.processFieldsInlcude(needleList);
-                fields = __spreadArray(__spreadArray([], fields), tempFields);
+                var tempFields = (0, exports.processFieldsInlcude)(needleList);
+                fields = __spreadArray(__spreadArray([], fields, true), tempFields, true);
             }
             else if (!derivedFieldExcludes.includes(arg.name)) {
                 var tempFields = Array.isArray(arg.key) ? arg.key : [arg.key];
-                tempFields = exports.processFieldsInlcude(tempFields);
-                fields = __spreadArray(__spreadArray([], fields), tempFields);
+                tempFields = (0, exports.processFieldsInlcude)(tempFields);
+                fields = __spreadArray(__spreadArray([], fields, true), tempFields, true);
             }
         });
-        derivedFields = __spreadArray(__spreadArray([], derivedFields), fields);
+        derivedFields = __spreadArray(__spreadArray([], derivedFields, true), fields, true);
     });
     return derivedFields;
 };

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 = "" + prepend + finalValue;
+        finalValue = "".concat(prepend).concat(finalValue);
     }
     if (append) {
-        finalValue = "" + finalValue + append;
+        finalValue = "".concat(finalValue).concat(append);
     }
     return finalValue;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -32,8 +32,8 @@
     "@types/express": "^4.17.7",
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
-    "drapcode-constant": "^1.2.4",
-    "drapcode-logger": "^1.0.4",
+    "drapcode-constant": "^1.2.7",
+    "drapcode-logger": "^1.0.5",
     "drapcode-redis": "^1.0.4",
     "express": "^4.17.1",
     "lodash": "^4.17.21",