drapcode-utility 1.2.9 → 1.3.1

package/build/utils/util.js

@@ -21,17 +21,52 @@ 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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.replaceValueFromSource = 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"));
+// 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 environmentFixKey = "environment_variable.";
+var tenantFixKey = "current_tenant.";
 var validateString = function (str) {
     var specialChar = /[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/;
     var isNumber = str.match(/\d+/g);
@@ -43,7 +78,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();
     });
@@ -170,8 +205,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) {
@@ -202,7 +237,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;
@@ -212,7 +247,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;
     }
@@ -235,19 +270,19 @@ var validateAlphanumericString = function (str) {
     return false;
 };
 exports.validateAlphanumericString = validateAlphanumericString;
-var formatCustomCSSClasses = function (projectCustomCSSClasses) {
-    if (!projectCustomCSSClasses || !Array.isArray(projectCustomCSSClasses)) {
+var formatCustomCSSClasses = function (customClasses) {
+    if (!customClasses || !Array.isArray(customClasses)) {
         return "";
     }
     var projectCustomCSSClassesData = "";
-    projectCustomCSSClasses.forEach(function (element) {
+    customClasses.forEach(function (element) {
         if (element.classProperty) {
             var classWithProp = JSON.stringify(element.classProperty);
             var unquotedClassWithProp = classWithProp
                 .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;
@@ -258,18 +293,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")) {
@@ -295,7 +330,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];
             }
@@ -395,7 +430,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
@@ -430,35 +465,6 @@ 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) {
@@ -470,8 +476,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;
@@ -496,16 +502,53 @@ 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;
 };
+var replaceValueFromSource = function (variableName, environment, tenant) {
+    if (variableName && typeof variableName === "string") {
+        if (variableName.startsWith(environmentFixKey)) {
+            return replaceValueFromEnvironment(variableName, environment);
+        }
+        else if (variableName.startsWith(tenantFixKey)) {
+            return replaceValueFromTenant(variableName, tenant);
+        }
+        else {
+            return variableName;
+        }
+    }
+    else {
+        return variableName;
+    }
+};
+exports.replaceValueFromSource = replaceValueFromSource;
+var replaceValueFromEnvironment = function (variableName, environment) {
+    if (variableName &&
+        typeof variableName === "string" &&
+        variableName.startsWith(environmentFixKey) &&
+        environment &&
+        environment.constants) {
+        var envConstant = environment.constants.find(function (env) { return env.name === variableName.replace(environmentFixKey, ""); });
+        return envConstant.value;
+    }
+    else {
+        return variableName;
+    }
+};
+var replaceValueFromTenant = function (variableName, tenant) {
+    if (!tenant) {
+        return variableName;
+    }
+    variableName = variableName.replace(tenantFixKey, "");
+    return lodash_1.default.get(tenant, variableName);
+};

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.9",
+  "version": "1.3.1",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -21,6 +21,7 @@
   "devDependencies": {
     "@types/lodash": "^4.14.179",
     "@types/mime-types": "^2.1.4",
+    "@types/uuid": "^9.0.8",
     "del-cli": "^5.0.0",
     "typescript": "^4.0.2"
   },
@@ -32,7 +33,7 @@
     "@types/express": "^4.17.7",
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
-    "drapcode-constant": "^1.2.9",
+    "drapcode-constant": "^1.3.0",
     "drapcode-logger": "^1.0.7",
     "drapcode-redis": "^1.0.4",
     "express": "^4.17.1",
@@ -40,6 +41,7 @@
     "mime-types": "^2.1.35",
     "moment": "^2.29.0",
     "stringify-object": "^3.3.0",
+    "uuid": "^8.3.2",
     "voca": "^1.4.0"
   }
 }