drapcode-utility 1.5.0 → 1.5.2

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]) {
@@ -76,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, _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;
@@ -89,41 +89,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((0, uuid_1.v4)(), "/").concat(file.originalname);
+                        s3Config.key = s3Key + "/" + uuid_1.v4() + "/" + 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];
@@ -131,11 +128,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((0, uuid_1.v4)(), "/").concat(files.originalname);
+                        s3Config.key = s3Config.key + "/" + uuid_1.v4() + "/" + 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];
             }
         });
@@ -159,7 +156,7 @@ var processFileUploadToS3 = function (file, s3Client, s3Config, encryption, opti
                     params = null;
                     encryptedFilePath = null;
                     if (!encrypt) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, encryption_1.cryptFile)(file.path, encryption, false)];
+                    return [4 /*yield*/, encryption_1.cryptFile(file.path, encryption, false)];
                 case 2:
                     encryptedFilePath = _a.sent();
                     console.log("encryptedFilePath", encryptedFilePath);

package/build/utils/token.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]) {
@@ -56,8 +56,8 @@ var generateToken = function (projectId) { return __awaiter(void 0, void 0, void
                     randomIndex = Math.floor(Math.random() * characters.length);
                     token += characters.charAt(randomIndex);
                 }
-                token = "".concat(token, ".").concat(timestamp);
-                return [4 /*yield*/, (0, drapcode_redis_1.redis_get_method)(uniqueSessionId)];
+                token = token + "." + timestamp;
+                return [4 /*yield*/, drapcode_redis_1.redis_get_method(uniqueSessionId)];
             case 2:
                 data = _b.sent();
                 if (!data || !data[projectId] || !data[projectId].length) {

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

@@ -21,14 +21,10 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-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 };
@@ -81,7 +77,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();
     });
@@ -208,8 +204,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) {
@@ -240,7 +236,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;
@@ -250,7 +246,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;
     }
@@ -285,7 +281,7 @@ var formatCustomCSSClasses = function (customClasses) {
                 .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;
@@ -296,18 +292,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")) {
@@ -333,7 +329,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];
             }
@@ -433,7 +429,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
@@ -479,8 +475,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, true), derivedFields, true).filter(function (value, index, array) { return array.indexOf(value) === index; });
-    result = __spreadArray(__spreadArray([], fieldsInclude, true), extraField, true);
+    var extraField = __spreadArray(__spreadArray([], refFields), derivedFields).filter(function (value, index, array) { return array.indexOf(value) === index; });
+    result = __spreadArray(__spreadArray([], fieldsInclude), extraField);
     return result;
 };
 exports.processFieldsInlcude = processFieldsInlcude;
@@ -505,16 +501,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 = (0, exports.processFieldsInlcude)(needleList);
-                fields = __spreadArray(__spreadArray([], fields, true), tempFields, true);
+                var tempFields = exports.processFieldsInlcude(needleList);
+                fields = __spreadArray(__spreadArray([], fields), tempFields);
             }
             else if (!derivedFieldExcludes.includes(arg.name)) {
                 var tempFields = Array.isArray(arg.key) ? arg.key : [arg.key];
-                tempFields = (0, exports.processFieldsInlcude)(tempFields);
-                fields = __spreadArray(__spreadArray([], fields, true), tempFields, true);
+                tempFields = exports.processFieldsInlcude(tempFields);
+                fields = __spreadArray(__spreadArray([], fields), tempFields);
             }
         });
-        derivedFields = __spreadArray(__spreadArray([], derivedFields, true), fields, true);
+        derivedFields = __spreadArray(__spreadArray([], derivedFields), fields);
     });
     return derivedFields;
 };
@@ -590,7 +586,7 @@ var assignFieldValue = function (formattedField, field, fieldName, filledItemdat
     value = formattedField.extraFieldSetting
         ? formattedField.extraFieldSetting.defaultValue
         : filledItemdata[fieldName];
-    value = (0, format_fields_1.getFormatFieldData)(value, field.type);
+    value = format_fields_1.getFormatFieldData(value, field.type);
     return value;
 };
 var validateData = function (fields, data) {
@@ -611,7 +607,7 @@ var validateData = function (fields, data) {
                 fieldValue = JSON.parse(fieldValue);
             }
             catch (error) {
-                errors.push("Error parsing ".concat(fieldTitle, ": ").concat(error.message));
+                errors.push("Error parsing " + fieldTitle + ": " + error.message);
                 return;
             }
         }
@@ -620,50 +616,50 @@ var validateData = function (fields, data) {
                 if (typeof fieldValue !== "string" &&
                     typeof fieldValue !== "number" &&
                     Object.prototype.toString.call(fieldValue) !== "[object Date]") {
-                    errors.push("".concat(fieldTitle, " must be a string"));
+                    errors.push(fieldTitle + " must be a string");
                 }
                 break;
             case "large_text":
             case "color":
                 if (typeof fieldValue !== "string") {
-                    errors.push("".concat(fieldTitle, " must be a string"));
+                    errors.push(fieldTitle + " must be a string");
                 }
                 break;
             case "uuid":
-                if (typeof fieldValue !== "string" || !(0, uuid_1.validate)(fieldValue)) {
-                    errors.push("".concat(fieldTitle, " must be a valid UUID string"));
+                if (typeof fieldValue !== "string" || !uuid_1.validate(fieldValue)) {
+                    errors.push(fieldTitle + " must be a valid UUID string");
                 }
                 break;
             case "reference":
             case "belongsTo":
                 if (!Array.isArray(fieldValue) ||
                     fieldValue.some(function (item) { return typeof item !== "string"; })) {
-                    errors.push("".concat(fieldTitle, " must be an array of valid UUID strings"));
+                    errors.push(fieldTitle + " must be an array of valid UUID strings");
                 }
                 break;
             case "createdAt":
             case "updatedAt":
             case "date":
                 if (fieldValue && isNaN(Date.parse(fieldValue))) {
-                    errors.push("".concat(fieldTitle, " must be a valid date"));
+                    errors.push(fieldTitle + " must be a valid date");
                 }
                 break;
             case "boolean":
                 if (typeof fieldValue !== "boolean") {
-                    errors.push("".concat(fieldTitle, " must be a boolean"));
+                    errors.push(fieldTitle + " must be a boolean");
                 }
                 break;
             case "email":
                 if (typeof fieldValue !== "string" ||
                     !/\S+@\S+\.\S+/.test(fieldValue)) {
-                    errors.push("".concat(fieldTitle, " must be a valid email address"));
+                    errors.push(fieldTitle + " must be a valid email address");
                     break;
                 }
                 break;
             case "tel":
                 var telPattern = /^\+?(\d{1,3})?[-\s]?(\(\d{1,4}\)|\d{1,4})[-\s]?(\d{1,4}[-\s]?\d{1,4}|\d{7,10})$/;
                 if (typeof fieldValue !== "string" || !telPattern.test(fieldValue)) {
-                    errors.push("".concat(fieldTitle, " must be a valid phone number"));
+                    errors.push(fieldTitle + " must be a valid phone number");
                 }
                 break;
             case "static_option":
@@ -673,16 +669,16 @@ var validateData = function (fields, data) {
                 }
                 else if (Array.isArray(fieldValue)) {
                     if (fieldValue.some(function (item) { return typeof item !== "string"; })) {
-                        errors.push("".concat(fieldTitle, " must be an array of strings"));
+                        errors.push(fieldTitle + " must be an array of strings");
                     }
                 }
                 else {
-                    errors.push("".concat(fieldTitle, " must be a string or an array of strings"));
+                    errors.push(fieldTitle + " must be a string or an array of strings");
                 }
                 break;
             case "url":
-                if (typeof fieldValue !== "string" || !(0, exports.validateUrl)(fieldValue)) {
-                    errors.push("".concat(fieldTitle, " must be a valid URL"));
+                if (typeof fieldValue !== "string" || !exports.validateUrl(fieldValue)) {
+                    errors.push(fieldTitle + " must be a valid URL");
                 }
                 break;
             case "file":
@@ -692,18 +688,18 @@ var validateData = function (fields, data) {
                             !item.key ||
                             typeof item.key !== "string";
                     })) {
-                        errors.push("".concat(fieldTitle, " must be an array of objects with 'key' property as string"));
+                        errors.push(fieldTitle + " must be an array of objects with 'key' property as string");
                     }
                 }
                 else if (typeof fieldValue !== "object" ||
                     !fieldValue.key ||
                     typeof fieldValue.key !== "string") {
-                    errors.push("".concat(fieldTitle, " must be an object with 'key' property as string"));
+                    errors.push(fieldTitle + " must be an object with 'key' property as string");
                 }
                 break;
             case "number":
                 if (isNaN(Number(fieldValue))) {
-                    errors.push("".concat(fieldTitle, " must be a valid number."));
+                    errors.push(fieldTitle + " must be a valid number.");
                 }
                 break;
             default:

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.5.0",
+  "version": "1.5.2",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -33,8 +33,8 @@
     "@types/express": "^4.17.7",
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
-    "drapcode-constant": "^1.4.2",
-    "drapcode-logger": "^1.1.4",
+    "drapcode-constant": "^1.4.5",
+    "drapcode-logger": "^1.1.6",
     "drapcode-redis": "^1.0.5",
     "express": "^4.17.1",
     "lodash": "^4.17.21",