drapcode-utility 1.5.6 → 1.5.8

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 };
@@ -77,7 +81,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();
     });
@@ -204,8 +208,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) {
@@ -236,7 +240,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;
@@ -246,7 +250,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;
     }
@@ -281,29 +285,35 @@ var formatCustomCSSClasses = function (customClasses) {
                 .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;
 };
 exports.formatCustomCSSClasses = formatCustomCSSClasses;
-var replaceDataValueIntoExpression = function (expression, data, user, tenant, sessionValue, envConstants, sessionFormValue, localStorageValue, cookiesValue) {
+var replaceDataValueIntoExpression = function (expression, data, user, tenant, userSetting, sessionValue, envConstants, sessionFormValue, localStorageValue, cookiesValue) {
     var _a;
     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_settings")) {
+            prop = prop.replace("current_settings.", "");
+            if (Object.keys(userSetting).length > 0) {
+                dataOfItem = (0, exports.parseValueFromData)(userSetting, prop);
             }
         }
         else if (prop.includes("current_session")) {
@@ -350,7 +360,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];
             }
@@ -450,7 +460,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
@@ -496,8 +506,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;
@@ -522,16 +532,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;
 };
@@ -607,7 +617,7 @@ var assignFieldValue = function (formattedField, field, fieldName, filledItemdat
     value = formattedField.extraFieldSetting
         ? formattedField.extraFieldSetting.defaultValue
         : filledItemdata[fieldName];
-    value = format_fields_1.getFormatFieldData(value, field.type);
+    value = (0, format_fields_1.getFormatFieldData)(value, field.type);
     return value;
 };
 var validateData = function (fields, data) {
@@ -628,7 +638,7 @@ var validateData = function (fields, data) {
                 fieldValue = JSON.parse(fieldValue);
             }
             catch (error) {
-                errors.push("Error parsing " + fieldTitle + ": " + error.message);
+                errors.push("Error parsing ".concat(fieldTitle, ": ").concat(error.message));
                 return;
             }
         }
@@ -637,50 +647,50 @@ var validateData = function (fields, data) {
                 if (typeof fieldValue !== "string" &&
                     typeof fieldValue !== "number" &&
                     Object.prototype.toString.call(fieldValue) !== "[object Date]") {
-                    errors.push(fieldTitle + " must be a string");
+                    errors.push("".concat(fieldTitle, " must be a string"));
                 }
                 break;
             case "large_text":
             case "color":
                 if (typeof fieldValue !== "string") {
-                    errors.push(fieldTitle + " must be a string");
+                    errors.push("".concat(fieldTitle, " must be a string"));
                 }
                 break;
             case "uuid":
-                if (typeof fieldValue !== "string" || !uuid_1.validate(fieldValue)) {
-                    errors.push(fieldTitle + " must be a valid UUID string");
+                if (typeof fieldValue !== "string" || !(0, uuid_1.validate)(fieldValue)) {
+                    errors.push("".concat(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(fieldTitle + " must be an array of valid UUID strings");
+                    errors.push("".concat(fieldTitle, " must be an array of valid UUID strings"));
                 }
                 break;
             case "createdAt":
             case "updatedAt":
             case "date":
                 if (fieldValue && isNaN(Date.parse(fieldValue))) {
-                    errors.push(fieldTitle + " must be a valid date");
+                    errors.push("".concat(fieldTitle, " must be a valid date"));
                 }
                 break;
             case "boolean":
                 if (typeof fieldValue !== "boolean") {
-                    errors.push(fieldTitle + " must be a boolean");
+                    errors.push("".concat(fieldTitle, " must be a boolean"));
                 }
                 break;
             case "email":
                 if (typeof fieldValue !== "string" ||
                     !/\S+@\S+\.\S+/.test(fieldValue)) {
-                    errors.push(fieldTitle + " must be a valid email address");
+                    errors.push("".concat(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(fieldTitle + " must be a valid phone number");
+                    errors.push("".concat(fieldTitle, " must be a valid phone number"));
                 }
                 break;
             case "static_option":
@@ -690,16 +700,16 @@ var validateData = function (fields, data) {
                 }
                 else if (Array.isArray(fieldValue)) {
                     if (fieldValue.some(function (item) { return typeof item !== "string"; })) {
-                        errors.push(fieldTitle + " must be an array of strings");
+                        errors.push("".concat(fieldTitle, " must be an array of strings"));
                     }
                 }
                 else {
-                    errors.push(fieldTitle + " must be a string or an array of strings");
+                    errors.push("".concat(fieldTitle, " must be a string or an array of strings"));
                 }
                 break;
             case "url":
-                if (typeof fieldValue !== "string" || !exports.validateUrl(fieldValue)) {
-                    errors.push(fieldTitle + " must be a valid URL");
+                if (typeof fieldValue !== "string" || !(0, exports.validateUrl)(fieldValue)) {
+                    errors.push("".concat(fieldTitle, " must be a valid URL"));
                 }
                 break;
             case "file":
@@ -709,18 +719,18 @@ var validateData = function (fields, data) {
                             !item.key ||
                             typeof item.key !== "string";
                     })) {
-                        errors.push(fieldTitle + " must be an array of objects with 'key' property as string");
+                        errors.push("".concat(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(fieldTitle + " must be an object with 'key' property as string");
+                    errors.push("".concat(fieldTitle, " must be an object with 'key' property as string"));
                 }
                 break;
             case "number":
                 if (isNaN(Number(fieldValue))) {
-                    errors.push(fieldTitle + " must be a valid number.");
+                    errors.push("".concat(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 = "" + 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.5.6",
+  "version": "1.5.8",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -19,6 +19,8 @@
   "author": "Drapcode",
   "license": "ISC",
   "devDependencies": {
+    "@types/dompurify": "^3.0.5",
+    "@types/jsdom": "^21.1.7",
     "@types/lodash": "^4.14.179",
     "@types/mime-types": "^2.1.4",
     "@types/uuid": "^9.0.8",
@@ -34,15 +36,19 @@
     "@types/gm": "^1.25.4",
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
-    "drapcode-constant": "^1.4.8",
-    "drapcode-logger": "^1.1.8",
-    "drapcode-redis": "^1.0.5",
+    "dompurify": "^3.1.7",
+    "drapcode-constant": "^1.4.9",
+    "drapcode-logger": "^1.1.9",
+    "drapcode-redis": "^1.0.6",
+    "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",
+    "jsdom": "^25.0.1",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
     "moment": "^2.29.0",
     "stringify-object": "^3.3.0",
+    "svgo": "^3.3.2",
     "uuid": "^8.3.2",
     "voca": "^1.4.0"
   }