drapcode-utility 1.2.9 → 1.3.1

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,21 +35,27 @@ 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;
 var drapcode_constant_1 = require("drapcode-constant");
 var date_util_1 = require("./date-util");
 var util_1 = require("./util");
-var queryParserNew = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj) {
+var prepare_query_1 = require("./prepare-query");
+var queryParserNew = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, lookupConfig) {
     if (currentUser === void 0) { currentUser = {}; }
     if (searchObj === void 0) { searchObj = null; }
     if (refCollectionFieldsInItems === void 0) { refCollectionFieldsInItems = null; }
     if (searchQueryTypeObj === void 0) { searchQueryTypeObj = {}; }
+    if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
         var filterQuery, aggregateQuery, queryStr, searchQueryObj_1, finalQuery, likeQuery_1, projection, finder, sortBy, orderBy, aggregateFunctionField, offset, limit, direction, str;
         var _a;
@@ -64,7 +70,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser);
                     console.log("**************************");
                     console.log("**************************");
-                    console.log("filterQuery", filterQuery);
+                    console.log("filterQuery", JSON.stringify(filterQuery));
                     console.log("==> searchQueryTypeObj :>>", searchQueryTypeObj);
                     aggregateQuery = [];
                     queryStr = ".aggregate([])";
@@ -81,11 +87,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 +125,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 +141,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 +166,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 +181,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",
                                             },
@@ -197,7 +203,6 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                             }
                         });
                         if (likeQuery_1.length) {
-                            // aggregateQuery.push({ $match: { $or: likeQuery } });
                             aggregateQuery.push({ $match: { $and: likeQuery_1 } });
                         }
                     }
@@ -205,94 +210,14 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     finder = query.finder, sortBy = query.sortBy, orderBy = query.orderBy, aggregateFunctionField = query.aggregateFunctionField;
                     if (!(finder != "COUNT" && refCollectionFieldsInItems)) return [3 /*break*/, 2];
                     return [4 /*yield*/, Promise.all(refCollectionFieldsInItems.map(function (field) {
-                            var _a, _b, _c;
-                            if (["reference", "multi_reference", "belongsTo"].includes(field.type)) {
-                                var collectionName_1 = field.refCollection
-                                    ? field.refCollection["collectionName"]
-                                    : null;
-                                if (collectionName_1) {
-                                    if (field.type === "belongsTo") {
-                                        aggregateQuery.push({
-                                            $lookup: {
-                                                from: "" + collectionName_1,
-                                                localField: field.fieldName,
-                                                foreignField: "uuid",
-                                                as: field.fieldName,
-                                            },
-                                        });
-                                        aggregateQuery.push({
-                                            $addFields: (_a = {},
-                                                _a["_$belongsToMetaData"] = field,
-                                                _a),
-                                        });
-                                    }
-                                    else {
-                                        aggregateQuery.push({
-                                            $lookup: {
-                                                from: "" + collectionName_1,
-                                                let: (_b = {}, _b["" + field.fieldName] = "$" + field.fieldName, _b),
-                                                pipeline: [
-                                                    {
-                                                        $match: {
-                                                            $expr: {
-                                                                $in: [
-                                                                    "$uuid",
-                                                                    {
-                                                                        $cond: {
-                                                                            if: {
-                                                                                $in: ["$$" + field.fieldName, ["", null]],
-                                                                            },
-                                                                            then: [],
-                                                                            else: { $ifNull: ["$$" + field.fieldName, []] },
-                                                                        },
-                                                                    },
-                                                                ],
-                                                            },
-                                                        },
-                                                    },
-                                                    {
-                                                        $lookup: {
-                                                            from: "user",
-                                                            let: { createdBy: "$createdBy" },
-                                                            pipeline: [
-                                                                {
-                                                                    $match: {
-                                                                        $expr: { $eq: ["$uuid", "$$createdBy"] },
-                                                                    },
-                                                                },
-                                                                { $project: { _id: 0, password: 0 } },
-                                                            ],
-                                                            as: "createdBy",
-                                                        },
-                                                    },
-                                                ],
-                                                as: field.fieldName,
-                                            },
-                                        });
-                                    }
-                                }
-                            }
-                            if (field.type === "createdBy")
-                                aggregateQuery.push({
-                                    $lookup: {
-                                        from: "user",
-                                        let: (_c = {}, _c["" + field.fieldName] = "$" + field.fieldName, _c),
-                                        pipeline: [
-                                            {
-                                                $match: { $expr: { $eq: ["$uuid", "$$" + field.fieldName] } },
-                                            },
-                                            { $project: { _id: 0, password: 0 } },
-                                        ],
-                                        as: field.fieldName,
-                                    },
-                                });
+                            return (0, prepare_query_1.commonLookupSetting)(field, lookupConfig, aggregateQuery);
                         }))];
                 case 1:
                     _b.sent();
                     _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 +225,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 +256,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 +294,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 +303,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 +323,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 +422,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;
     }
@@ -591,11 +516,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);
@@ -603,7 +528,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 {
@@ -620,10 +545,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) {
@@ -661,11 +586,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 : "";
@@ -692,9 +617,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]) {
@@ -57,6 +57,7 @@ var mime_types_1 = __importDefault(require("mime-types"));
 var lib_storage_1 = require("@aws-sdk/lib-storage");
 var encryption_1 = require("../encryption");
 var encryption_2 = require("../encryption");
+var uuid_1 = require("uuid");
 var createS3Client = function (awsConfig) {
     if (!awsConfig) {
         return null;
@@ -75,9 +76,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 +89,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((0, uuid_1.v4)(), "/").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 +131,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((0, uuid_1.v4)(), "/").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];
             }
         });
@@ -142,33 +146,49 @@ var processFileUploadToS3 = function (file, s3Client, s3Config, encryption, opti
     if (options === void 0) { options = {}; }
     if (encrypt === void 0) { encrypt = false; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var contentType, acl, key, bucket, params, encryptedBody, parallelUploads3, data, originalname, mimetype, size, finalObject, error_1;
+        var contentType, acl, key, bucket, params, encryptedFilePath, parallelUploads3, data, originalname, mimetype, size, finalObject, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 5, , 6]);
+                    console.log("encryption processFileUploadToS3", encryption);
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 6, , 7]);
                     contentType = mime_types_1.default.lookup(file.originalname) || "";
                     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)];
-                case 1:
-                    encryptedBody = _a.sent();
+                    encryptedFilePath = null;
+                    if (!encrypt) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, encryption_1.cryptFile)(file.path, encryption, false)];
+                case 2:
+                    encryptedFilePath = _a.sent();
+                    console.log("encryptedFilePath", encryptedFilePath);
                     params = __assign({ Bucket: bucket, ACL: acl, Key: key, 
                         //@ts-ignore
-                        Body: fs_1.default.createReadStream(encryptedBody), ContentType: contentType }, options);
-                    return [3 /*break*/, 3];
-                case 2:
-                    params = __assign({ Bucket: bucket, ACL: acl, Key: key, Body: fs_1.default.createReadStream(file.path), ContentType: contentType }, options);
-                    _a.label = 3;
+                        Body: fs_1.default.createReadStream(encryptedFilePath), ContentType: contentType }, options);
+                    return [3 /*break*/, 4];
                 case 3:
+                    params = __assign({ Bucket: bucket, ACL: acl, Key: key, Body: fs_1.default.createReadStream(file.path), ContentType: contentType }, options);
+                    _a.label = 4;
+                case 4:
                     parallelUploads3 = new lib_storage_1.Upload({
                         client: s3Client,
                         params: params,
                     });
                     return [4 /*yield*/, parallelUploads3.done()];
-                case 4:
+                case 5:
                     data = _a.sent();
+                    if (data) {
+                        try {
+                            fs_1.default.unlinkSync(file.path);
+                            if (encryptedFilePath) {
+                                fs_1.default.unlinkSync(encryptedFilePath);
+                            }
+                        }
+                        catch (unlinkError) {
+                            console.error("Error deleting local file:", unlinkError);
+                        }
+                    }
                     originalname = file.originalname, mimetype = file.mimetype, size = file.size;
                     finalObject = {
                         originalname: originalname,
@@ -178,11 +198,11 @@ var processFileUploadToS3 = function (file, s3Client, s3Config, encryption, opti
                         contentType: contentType,
                     };
                     return [2 /*return*/, finalObject];
-                case 5:
+                case 6:
                     error_1 = _a.sent();
                     console.log("error", error_1);
                     return [2 /*return*/, null];
-                case 6: return [2 /*return*/];
+                case 7: return [2 /*return*/];
             }
         });
     });

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;
@@ -19,7 +19,7 @@ export declare const checkAndCompareValue: (input1: any, input2: any) => boolean
 export declare const arraysEqual: (array1: any, array2: any) => boolean;
 export declare const convertItemToArray: (itemValue: any) => any[];
 export declare const validateAlphanumericString: (str: string) => false | "String should contain only numbers and letters";
-export declare const formatCustomCSSClasses: (projectCustomCSSClasses: any) => string;
+export declare const formatCustomCSSClasses: (customClasses: any) => string;
 export declare const replaceDataValueIntoExpression: (expression: string, data: any, user: any, tenant: any, sessionValue: any, envConstants: any, sessionFormValue: any) => string;
 export declare const parseJsonString: (str: string) => any;
 export declare const parseValueFromData: (data: any, fieldName: string) => any;
@@ -27,3 +27,4 @@ export declare const unflattenObject: (obj: any) => {};
 export declare const replaceTransferObjectValueIntoExpression: (expression: string, transferObject: any) => string;
 export declare const removeMongoDbId: (result: any[]) => any[];
 export declare const processFieldsInlcude: (fieldsInclude: any) => any;
+export declare const replaceValueFromSource: (variableName: any, environment: any, tenant: any) => any;