drapcode-utility 1.5.7 → 1.5.9

package/build/format-fields/index.js

@@ -115,7 +115,7 @@ var cleanXssValuesFromData = function (data, fields) {
     try {
         if (fields) {
             fields.forEach(function (field) {
-                if (field.type === drapcode_constant_1.FieldTypes.large_text.id)
+                if ([drapcode_constant_1.FieldTypes.large_text.id, drapcode_constant_1.FieldTypes.markdown.id].includes(field.type))
                     exceptionFields.push(field.fieldName);
             });
         }
@@ -138,15 +138,30 @@ var processXssData = function (item, exceptionFields) {
         for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
             var fieldName = keys_1[_i];
             if (!exceptionFields.includes(fieldName)) {
-                if (Array.isArray(item[fieldName])) {
-                    item[fieldName] = item[fieldName].map(function (val) {
-                        return domPurify.sanitize(val);
-                    });
-                }
-                else
-                    item[fieldName] = domPurify.sanitize(item[fieldName]);
+                item[fieldName] = sanitizeFieldValue(item[fieldName]);
             }
         }
     }
     return item;
 };
+var sanitizeFieldValue = function (value) {
+    if (value) {
+        if (Array.isArray(value)) {
+            value = value.map(function (val) { return sanitizeFieldValue(val); });
+        }
+        else if (typeof value === 'object' && value !== null) {
+            var tempItem = value;
+            var itemKeys = Object.keys(tempItem);
+            if (itemKeys.length) {
+                for (var _i = 0, itemKeys_1 = itemKeys; _i < itemKeys_1.length; _i++) {
+                    var key = itemKeys_1[_i];
+                    tempItem[key] = domPurify.sanitize(tempItem[key]);
+                }
+            }
+            value = tempItem;
+        }
+        else
+            value = domPurify.sanitize(value);
+    }
+    return value;
+};

package/build/utils/util.d.ts

@@ -20,7 +20,7 @@ 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: (customClasses: any) => string;
-export declare const replaceDataValueIntoExpression: (expression: string, data: any, user: any, tenant: any, sessionValue: any, envConstants: any, sessionFormValue: any, localStorageValue: any, cookiesValue: any) => string;
+export declare const replaceDataValueIntoExpression: (expression: string, data: any, user: any, tenant: any, userSetting: any, sessionValue: any, envConstants: any, sessionFormValue: any, localStorageValue: any, cookiesValue: any) => string;
 export declare const parseJsonString: (str: string) => any;
 export declare const parseValueFromData: (data: any, fieldName: string) => any;
 export declare const unflattenObject: (obj: any) => {};

package/build/utils/util.js

@@ -291,7 +291,7 @@ var formatCustomCSSClasses = function (customClasses) {
     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"); });
@@ -310,6 +310,12 @@ var replaceDataValueIntoExpression = function (expression, data, user, tenant, s
                 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")) {
             prop = prop.replace("current_session.", "");
             if (Object.keys(sessionValue).length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.5.7",
+  "version": "1.5.9",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,8 +37,8 @@
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^1.4.8",
-    "drapcode-logger": "^1.1.8",
+    "drapcode-constant": "^1.4.9",
+    "drapcode-logger": "^1.1.9",
     "drapcode-redis": "^1.0.6",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",