drapcode-utility 1.2.2-beta → 1.2.3

package/build/utils/util.js

@@ -21,11 +21,20 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeMongoDbId = exports.replaceTransferObjectValueIntoExpression = exports.unflattenObject = exports.parseValueFromData = exports.parseJsonString = exports.replaceDataValueIntoExpression = exports.formatCustomCSSClasses = exports.validateAlphanumericString = exports.convertItemToArray = exports.arraysEqual = exports.checkAndCompareValue = exports.restructureData = exports.formatCollectionAndFieldName = exports.cleanCollectionAndFieldName = exports.stringToExpression = exports.expressionToString = exports.getSpecialCharectorReplacedExpression = exports.validateUuidString = exports.validateEmail = exports.snakeCaseToTitleCase = exports.dynamicSort = exports.checkValidArray = exports.isObject = exports.isEmptyObject = exports.isEmpty = exports.clearSpaceAndReformat = exports.camelize = exports.validateString = void 0;
+exports.processFieldsInlcude = exports.removeMongoDbId = exports.replaceTransferObjectValueIntoExpression = exports.unflattenObject = exports.parseValueFromData = exports.parseJsonString = exports.replaceDataValueIntoExpression = exports.formatCustomCSSClasses = exports.validateAlphanumericString = exports.convertItemToArray = exports.arraysEqual = exports.checkAndCompareValue = exports.restructureData = exports.formatCollectionAndFieldName = exports.cleanCollectionAndFieldName = exports.stringToExpression = exports.expressionToString = exports.getSpecialCharectorReplacedExpression = exports.validateUuidString = exports.validateEmail = exports.snakeCaseToTitleCase = exports.dynamicSort = exports.checkValidArray = exports.isObject = exports.isEmptyObject = exports.isEmpty = exports.clearSpaceAndReformat = exports.camelize = exports.validateString = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var validateString = function (str) {
     var specialChar = /[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/;
@@ -38,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();
     });
@@ -165,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) {
@@ -197,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;
@@ -207,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;
     }
@@ -242,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;
@@ -253,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")) {
@@ -290,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];
             }
@@ -390,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
@@ -425,3 +434,82 @@ var removeMongoDbId = function (result) {
     return result.map(moveUuidToTopLevel);
 };
 exports.removeMongoDbId = removeMongoDbId;
+// TODO: Refactor
+var derivedFieldExcludes = [
+    "formatType",
+    "restToLower",
+    "whitespace",
+    "type",
+    "noSplitopt",
+    "length",
+    "endopt",
+    "startLength",
+    "endLength",
+    "startString",
+    "endString",
+    "separator",
+    "expression",
+    "unixType",
+    "currency",
+    "maxFraction",
+    "position",
+    "refField",
+    "condition",
+    "match",
+    "refFieldType",
+    "index",
+    "positionOfRecords",
+    "numberOfRecords",
+    "elementToRender",
+    "indexNum",
+];
+var processFieldsInlcude = function (fieldsInclude) {
+    var result = fieldsInclude;
+    var refFieldsInclude = fieldsInclude.filter(function (field) {
+        return field.startsWith("RF::");
+    });
+    var derivedFieldsInclude = fieldsInclude.filter(function (field) {
+        return field.startsWith("DF::");
+    });
+    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);
+    return result;
+};
+exports.processFieldsInlcude = processFieldsInlcude;
+var processReferenceFieldInclude = function (refFieldsInclude) {
+    var refFields = [];
+    refFieldsInclude.forEach(function (exField) {
+        var field = exField.replace("RF::", "");
+        field = field.split(".")[0];
+        refFields.push(field);
+    });
+    return refFields;
+};
+var processDerivedFieldInclude = function (derivedFieldsInclude) {
+    var derivedFields = [];
+    derivedFieldsInclude.forEach(function (exField) {
+        var derivedFieldStr = exField.replace("DF::", "");
+        derivedFieldStr = derivedFieldStr.replaceAll("*#*#", '"');
+        var derivedFieldObj = JSON.parse(derivedFieldStr);
+        var fields = [];
+        derivedFieldObj.args.forEach(function (arg) {
+            var _a;
+            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);
+            }
+            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);
+            }
+        });
+        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-beta",
+  "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",