kwikid-forms 0.1.8 → 0.1.9

package/bundles/kwikid-forms.umd.js

@@ -1,10 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/cdk/drag-drop'), require('@angular/core'), require('@angular/forms'), require('kwikui'), require('lodash'), require('@taiga-ui/core'), require('@taiga-ui/kit'), require('kwikid-toolkit'), require('rxjs/operators'), require('jsonpath'), require('@taiga-ui/cdk'), require('@angular/common'), require('@angular/platform-browser'), require('@angular/animations'), require('@angular/common/http')) :
-    typeof define === 'function' && define.amd ? define('kwikid-forms', ['exports', '@angular/cdk/drag-drop', '@angular/core', '@angular/forms', 'kwikui', 'lodash', '@taiga-ui/core', '@taiga-ui/kit', 'kwikid-toolkit', 'rxjs/operators', 'jsonpath', '@taiga-ui/cdk', '@angular/common', '@angular/platform-browser', '@angular/animations', '@angular/common/http'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["kwikid-forms"] = {}, global.ng.cdk.dragDrop, global.ng.core, global.ng.forms, global.kwikui, global.lodash, global["@taiga-ui/core"], global["@taiga-ui/kit"], global["kwikid-toolkit"], global.rxjs.operators, global.jsonpath, global["@taiga-ui/cdk"], global.ng.common, global.ng.platformBrowser, global.ng.animations, global.ng.common.http));
-})(this, (function (exports, dragDrop, i0, i6, i2, _, i3, i4, kwikidToolkit, operators, jp, cdk, i5, i1, animations, http) { 'use strict';
-
-    function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/cdk/drag-drop'), require('@angular/core'), require('@angular/forms'), require('kwikui'), require('lodash'), require('@taiga-ui/core'), require('@taiga-ui/kit'), require('kwikid-toolkit'), require('rxjs/operators'), require('@taiga-ui/cdk'), require('@angular/common'), require('@angular/platform-browser'), require('@angular/animations'), require('@angular/common/http')) :
+    typeof define === 'function' && define.amd ? define('kwikid-forms', ['exports', '@angular/cdk/drag-drop', '@angular/core', '@angular/forms', 'kwikui', 'lodash', '@taiga-ui/core', '@taiga-ui/kit', 'kwikid-toolkit', 'rxjs/operators', '@taiga-ui/cdk', '@angular/common', '@angular/platform-browser', '@angular/animations', '@angular/common/http'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["kwikid-forms"] = {}, global.ng.cdk.dragDrop, global.ng.core, global.ng.forms, global.kwikui, global.lodash, global["@taiga-ui/core"], global["@taiga-ui/kit"], global["kwikid-toolkit"], global.rxjs.operators, global["@taiga-ui/cdk"], global.ng.common, global.ng.platformBrowser, global.ng.animations, global.ng.common.http));
+})(this, (function (exports, dragDrop, i0, i6, i2, lodash, i3, i4, kwikidToolkit, operators, cdk, i5, i1, animations, http) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -27,10 +25,8 @@
     var i0__namespace = /*#__PURE__*/_interopNamespace(i0);
     var i6__namespace = /*#__PURE__*/_interopNamespace(i6);
     var i2__namespace = /*#__PURE__*/_interopNamespace(i2);
-    var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
     var i3__namespace = /*#__PURE__*/_interopNamespace(i3);
     var i4__namespace = /*#__PURE__*/_interopNamespace(i4);
-    var jp__default = /*#__PURE__*/_interopDefaultLegacy(jp);
     var i5__namespace = /*#__PURE__*/_interopNamespace(i5);
     var i1__namespace = /*#__PURE__*/_interopNamespace(i1);
 
@@ -511,7 +507,7 @@
             if (event.previousContainer !== event.container) {
                 console.log("copying");
                 // Clone the item that was dropped.
-                var clone = _.cloneDeep(event.previousContainer.data[event.previousIndex]);
+                var clone = lodash.cloneDeep(event.previousContainer.data[event.previousIndex]);
                 clone.id = clone.key + "__" + this.revisedRandId();
                 event.previousContainer.data[event.previousIndex] = clone;
                 var newFormGroup_1 = new i6.FormGroup({});
@@ -603,99 +599,6 @@
         EApiStatusType["FAILED"] = "failed";
     })(EApiStatusType || (EApiStatusType = {}));
 
-    var EPatternKey;
-    (function (EPatternKey) {
-        EPatternKey["CUSTOM"] = "CUSTOM";
-        EPatternKey["IS_ADDRESS"] = "IS_ADDRESS";
-        EPatternKey["IS_ALPHA"] = "IS_ALPHA";
-        EPatternKey["IS_ALPHANUMERIC"] = "IS_ALPHANUMERIC";
-        EPatternKey["IS_BOOLEAN"] = "IS_BOOLEAN";
-        EPatternKey["IS_EMAIL"] = "IS_EMAIL";
-        EPatternKey["IS_EMPTY"] = "IS_EMPTY";
-        EPatternKey["IS_FALSE"] = "IS_FALSE";
-        EPatternKey["IS_HTML"] = "IS_HTML";
-        EPatternKey["IS_INTEGER"] = "IS_INTEGER";
-        EPatternKey["IS_IP_ADDRESS"] = "IS_IP_ADDRESS";
-        EPatternKey["IS_JSON"] = "IS_JSON";
-        EPatternKey["IS_LOWERCASE"] = "IS_LOWERCASE";
-        EPatternKey["IS_NOT_EMPTY"] = "IS_NOT_EMPTY";
-        EPatternKey["IS_NUMBER"] = "IS_NUMBER";
-        EPatternKey["IS_TRUE"] = "IS_TRUE";
-        EPatternKey["IS_UPPERCASE"] = "IS_UPPERCASE";
-        EPatternKey["IS_URL"] = "IS_URL";
-        EPatternKey["IS_AADHAAR_NUMBER"] = "IS_AADHAAR_NUMBER";
-        EPatternKey["IS_BANK_ACCOUNT_NO"] = "IS_BANK_ACCOUNT_NO";
-        EPatternKey["IS_BANK_SWIFT_CODE"] = "IS_BANK_SWIFT_CODE";
-        EPatternKey["IS_BIRTH_CERTIFICATE_NO"] = "IS_BIRTH_CERTIFICATE_NO";
-        EPatternKey["IS_CHEQUE_NO"] = "IS_CHEQUE_NO";
-        EPatternKey["IS_CIN"] = "IS_CIN";
-        EPatternKey["IS_CREDIT_CARD_NO"] = "IS_CREDIT_CARD_NO";
-        EPatternKey["IS_DRIVING_LICENSE"] = "IS_DRIVING_LICENSE";
-        EPatternKey["IS_GSTIN"] = "IS_GSTIN";
-        EPatternKey["IS_IFSC_NO"] = "IS_IFSC_NO";
-        EPatternKey["IS_MICR_CODE"] = "IS_MICR_CODE";
-        EPatternKey["IS_MOBILE_NO"] = "IS_MOBILE_NO";
-        EPatternKey["IS_MOBILE_NO_IN"] = "IS_MOBILE_NO_IN";
-        EPatternKey["IS_NEFT_OR_RTGS_NO"] = "IS_NEFT_OR_RTGS_NO";
-        EPatternKey["IS_PAN_NUMBER"] = "IS_PAN_NUMBER";
-        EPatternKey["IS_PASSPORT"] = "IS_PASSPORT";
-        EPatternKey["IS_PHONE_NO"] = "IS_PHONE_NO";
-        EPatternKey["IS_PINCODE"] = "IS_PINCODE";
-        EPatternKey["IS_PURCHASE_ORDER_NO"] = "IS_PURCHASE_ORDER_NO";
-        EPatternKey["IS_RATION_CARD_NO"] = "IS_RATION_CARD_NO";
-        EPatternKey["IS_SERVICE_TAX_NO"] = "IS_SERVICE_TAX_NO";
-        EPatternKey["IS_SOCIAL_SECURITY_NO"] = "IS_SOCIAL_SECURITY_NO";
-        EPatternKey["IS_UPI_TRANSACTION_REFERENCE_NO"] = "IS_UPI_TRANSACTION_REFERENCE_NO";
-        EPatternKey["IS_VAT_TIN_NO"] = "IS_VAT_TIN_NO";
-        EPatternKey["IS_VEHICLE_REGISTRATION_NO"] = "IS_VEHICLE_REGISTRATION_NO";
-        EPatternKey["IS_VOTER_ID"] = "IS_VOTER_ID";
-    })(EPatternKey || (EPatternKey = {}));
-    var EPattern;
-    (function (EPattern) {
-        EPattern["IS_ALPHA"] = "^[a-zA-Z]+$";
-        EPattern["IS_ADDRESS"] = "^(\\w*\\s*[#-,/.()&]*)+";
-        EPattern["IS_ALPHANUMERIC"] = "^[a-zA-Z0-9]+$";
-        EPattern["IS_BOOLEAN"] = "(true|false)";
-        EPattern["IS_EMAIL"] = "^\\w+([\\.-]?\\w+)*@\\w+([\\.-]?\\w+)*(\\.\\w{2,3})+$";
-        EPattern["IS_EMPTY"] = "^$";
-        EPattern["IS_FALSE"] = "false";
-        EPattern["IS_HTML"] = "^<([a-z]+)([^<]+)(?:>(.)</\\1>|\\s+/>)$";
-        EPattern["IS_INTEGER"] = "^[+-]?d+$";
-        EPattern["IS_IP_ADDRESS"] = "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$";
-        EPattern["IS_JSON"] = "^\\s*({(.|\\s)}|[(.|\\s)])\\s*$";
-        EPattern["IS_LOWERCASE"] = "^[a-z]+$";
-        EPattern["IS_NOT_EMPTY"] = "^.+$";
-        EPattern["IS_NUMBER"] = "^[+-]?d+(.d+)?$";
-        EPattern["IS_TRUE"] = "true";
-        EPattern["IS_UPPERCASE"] = "^[A-Z]+$";
-        EPattern["IS_URL"] = "^(?:http(s)?://)?[w.-]+(?:.[w.-]+)+[w-._~:/?#[]@!$&'()*+,;=.]+$";
-        EPattern["IS_AADHAAR_NUMBER"] = "^[0-9]{12}$";
-        EPattern["IS_BANK_ACCOUNT_NO"] = "^[0-9]{9,18}$";
-        EPattern["IS_BANK_SWIFT_CODE"] = "^[A-Z]{4}[A-Z]{2}[0-9A-Z]{2}[0-9A-Z]{3}$";
-        EPattern["IS_BIRTH_CERTIFICATE_NO"] = "^[A-Z]{2}[0-9]{6}[A-Z]{1}[0-9]{2}$";
-        EPattern["IS_CHEQUE_NO"] = "^[0-9]{6,14}$";
-        EPattern["IS_CIN"] = "^[A-Z]{3}[0-9]{5}[0-9A-Z]{3}$";
-        EPattern["IS_CREDIT_CARD_NO"] = "^[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{4}$";
-        EPattern["IS_DRIVING_LICENSE"] = "^[A-Z]{2}[0-9]{2}((19|20)[0-9][0-9])[0-9]{7}$";
-        EPattern["IS_GSTIN"] = "^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[1-9A-Z]{1}Z[0-9A-Z]{1}$";
-        EPattern["IS_IFSC_NO"] = "^[A-Z]{4}[0][A-Z0-9]{6}$";
-        EPattern["IS_MICR_CODE"] = "^[0-9]{9}$";
-        EPattern["IS_MOBILE_NO"] = "^[6-9]\\d{9}$";
-        EPattern["IS_MOBILE_NO_IN"] = "^(\\+91)[6-9]\\d{9}$";
-        EPattern["IS_NEFT_OR_RTGS_NO"] = "^[A-Z]{4}[0-9]{7}$";
-        EPattern["IS_PAN_NUMBER"] = "^[A-Z]{5}[[0-9]{4}[A-Z]{1}$";
-        EPattern["IS_PASSPORT"] = "^[A-PR-WYa-pr-wy][1-9]\\d\\s?\\d{4}[1-9]$";
-        EPattern["IS_PHONE_NO"] = "^[6-9]\\d{9}$";
-        EPattern["IS_PINCODE"] = "^[1-9][0-9]{5}$";
-        EPattern["IS_PURCHASE_ORDER_NO"] = "^[0-9]{1,5}$";
-        EPattern["IS_RATION_CARD_NO"] = "^[A-Z]{3}[0-9]{7}$";
-        EPattern["IS_SERVICE_TAX_NO"] = "^[A-Z]{5}[0-9]{4}[A-Z]{1}$";
-        EPattern["IS_SOCIAL_SECURITY_NO"] = "^[0-9]{3}-[0-9]{2}-[0-9]{4}$";
-        EPattern["IS_UPI_TRANSACTION_REFERENCE_NO"] = "^[a-zA-Z0-9]{3,128}@[a-z]{3,9}$";
-        EPattern["IS_VAT_TIN_NO"] = "^[0-9]{11}$";
-        EPattern["IS_VEHICLE_REGISTRATION_NO"] = "^[A-Z]{2}[0-9]{2}((19|20)[0-9][0-9])[0-9]{6}$";
-        EPattern["IS_VOTER_ID"] = "^[A-Z]{3}[0-9]{7}$";
-    })(EPattern || (EPattern = {}));
     var EMessageType;
     (function (EMessageType) {
         EMessageType["DEFAULT"] = "default";
@@ -720,168 +623,169 @@
         EFieldType["AADHAAR_NUMBER"] = "aadhaar-number";
     })(EFieldType || (EFieldType = {}));
 
-    var hasKey$1 = function (object, key) {
-        return object.hasOwnProperty(key);
-    };
-    var isEmpty$1 = function (value) {
-        if (value === "" || value === undefined || value === null) {
-            return true;
-        }
-        else if (value &&
-            Object.keys(value).length === 0 &&
-            Object.getPrototypeOf(value) === Object.prototype) {
-            return true;
-        }
-        else if (Array.isArray(value)) {
-            if (value.length === 0) {
-                return true;
-            }
-            else {
-                return false;
-            }
-        }
-        else {
-            return false;
-        }
-    };
-    var isNotEmpty$1 = function (value) {
-        return !isEmpty$1(value);
-    };
-    var handleJPQueryResponse$1 = function (value) {
-        /**
-         * jp.query doesn't always return an array with one element
-         * so directly can't access with [0], need to check conditionally
-         */
-        if (Array.isArray(value)) {
-            if (value.length > 0) {
-                value = value[0];
-            }
-            else if (value.length === 0) {
-                value = "";
+    var getFormFieldByKey = function (fields, key) {
+        var field = fields.find(function (field) {
+            if (field.key === key) {
+                return field;
             }
-        }
-        return value;
-    };
-    var jpQueryWrapper$1 = function (obj, key) {
-        return handleJPQueryResponse$1(jp__default["default"].query(obj, key));
-    };
-    var isSingleForm = function (formsList) {
-        return formsList.length === 1;
-    };
-
-    var hasKey = function (object, key) {
-        return object.hasOwnProperty(key);
-    };
-    var hasPath = function (object, path) {
-        return ___default["default"].has(object, path);
-    };
-    var isEmptyString = function (value) {
-        return value === "";
-    };
-    var isUndefined = function (value) {
-        return value === undefined;
-    };
-    var isNull = function (value) {
-        return value === null;
+        });
+        return field;
     };
-    var isEmptyObject = function (object) {
-        return (object &&
-            Object.keys(object).length === 0 &&
-            Object.getPrototypeOf(object) === Object.prototype);
+    var getFormFieldIndexByKey = function (fields, key) {
+        var fieldIndex;
+        fieldIndex = fields.findIndex(function (_) {
+            return key === _.key;
+        });
+        return fieldIndex;
     };
-    var isEmptyArray = function (arr) {
-        return arr.length === 0;
+    var highlightFormFieldError = function (field, error) {
+        field.invalid = error;
+        field.focus = error;
+        return field;
     };
-    var isEmpty = function (value) {
-        if (isEmptyString(value) || isUndefined(value) || isNull(value)) {
-            return true;
-        }
-        else if (isEmptyObject(value)) {
-            return true;
-        }
-        else if (Array.isArray(value)) {
-            if (isEmptyArray(value)) {
-                return true;
-            }
-            else {
-                return false;
+    var appendFormFieldMessage = function (field, message) {
+        var hasDuplicateMessage = function (messages, message) {
+            return messages.some(function (fieldMessage) {
+                return (fieldMessage.type === message.type &&
+                    fieldMessage.message === message.message);
+            });
+        };
+        field["messages"] = [];
+        if (kwikidToolkit.checkObjectKeyExists(field, "messages")) {
+            if (!hasDuplicateMessage(field["messages"], message)) {
+                field["messages"].push({
+                    type: message.type,
+                    message: message.message
+                });
             }
         }
         else {
-            return false;
+            field["messages"] = [{ type: message.type, message: message.message }];
         }
+        return field;
     };
-    var isNotEmpty = function (value) {
-        return !isEmpty(value);
-    };
-    var isEmptyBrowserStorageValue = function (value) {
-        return isNull(value) && isUndefined(value);
-    };
-    var isNotEmptyBrowserStorageValue = function (value) {
-        return !isEmptyBrowserStorageValue(value);
+    var removeFormFieldMessage = function (field, message) {
+        field["messages"] = field["messages"].filter(function (fieldMessage) {
+            return fieldMessage.type !== message.type;
+        });
+        return field;
     };
-    var handleJPQueryResponse = function (value) {
-        /**
-         * jp.query doesn't always return an array with one element
-         * so directly can't access with [0], need to check conditionally
-         */
-        if (Array.isArray(value)) {
-            if (value.length > 0) {
-                value = value[0];
-            }
-            else if (value.length === 0) {
-                value = "";
-            }
+    function showFormFieldError(fields, errors, key, error) {
+        var fieldIndex = fields.findIndex(function (field) {
+            return field.key === key;
+        });
+        var setErrorMessages = function (field, errors) {
+            var getErrorMessage = function (fieldLabel, errorType) {
+                var errorMessage = "";
+                switch (errorType) {
+                    case "required":
+                        errorMessage = fieldLabel + " is required!";
+                        break;
+                    case "email":
+                        errorMessage = fieldLabel + " has wrong email format!";
+                        break;
+                    case "min":
+                        errorMessage = fieldLabel + " has wrong value! Minimum value: " + field.validators.min;
+                        break;
+                    case "minlength":
+                        errorMessage = fieldLabel + " has wrong length! Required minimum length: " + field.validators.minLength;
+                        break;
+                    case "max":
+                        errorMessage = fieldLabel + " has wrong value! Maximum value: " + field.validators.maxLength;
+                        break;
+                    case "maxlength":
+                        errorMessage = fieldLabel + " has wrong length! Required maximum length: " + field.validators.maxLength;
+                        break;
+                    case "areEqual":
+                        errorMessage = fieldLabel + " must be equal!";
+                        break;
+                    case "pattern":
+                        errorMessage = fieldLabel + " is in incorrect format!";
+                        break;
+                    default:
+                        errorMessage = fieldLabel + ": " + errorType;
+                        break;
+                }
+                return errorMessage;
+            };
+            Object.keys(errors).forEach(function (error) {
+                field = appendFormFieldMessage(field, {
+                    type: "error",
+                    message: getErrorMessage(field.label, error)
+                });
+            });
+            return field;
+        };
+        if (error) {
+            fields[fieldIndex] = setErrorMessages(fields[fieldIndex], errors);
         }
         else {
-            value = "";
+            fields[fieldIndex]["messages"] = [];
         }
-        return value;
-    };
-    var jpQueryWrapper = function (obj, key) {
-        return handleJPQueryResponse(jp__default["default"].query(obj, key));
-    };
-    var replaceString = function (str, find, replace) {
-        return str.replace(new RegExp(find, "g"), replace);
-    };
-    var setFieldKeyValue = function (field, path, value) {
-        return ___default["default"].set(field, path, value);
+        fields[fieldIndex] = highlightFormFieldError(fields[fieldIndex], error);
+        return fields;
+    }
+    var convertFormFieldTypeDateToKwikUIFormat = function (date) {
+        var splitDate = date.split("-");
+        var tuiDay = new cdk.TuiDay(Number(splitDate[2]), // Year
+        Number(splitDate[1]) - 1, // Month, Why '-1' => Because Taiga-UI Required It, So...
+        Number(splitDate[0]) // Day
+        );
+        return tuiDay;
     };
-    var setValueToObject = function (object, path, value) {
-        return ___default["default"].set(object, path, value);
+    var convertFormFieldTypeDateToStandardFormat = function (date) {
+        var formattedDate;
+        var year = date.year;
+        var month = date.month;
+        var day = date.day;
+        formattedDate = day.toString().padStart(2, "0") + "-" + (month + 1)
+            .toString()
+            .padStart(2, "0") + "-" + year;
+        return formattedDate;
     };
-    var formatValue = function (field, fieldValue) {
-        var fieldType = field.type;
-        var value;
-        if (isNotEmpty(fieldValue)) {
-            switch (fieldType) {
+    var convertFormFieldValueToStandardFormat = function (field, value) {
+        var convertedValue = value;
+        if (kwikidToolkit.isNotEmptyValue(value)) {
+            switch (field.type) {
                 case EFieldType.DATE:
-                    var splitDate = fieldValue.split("-");
-                    value = new cdk.TuiDay(Number(splitDate[2]), // Year
-                    Number(splitDate[1]) - 1, // Month, Why '-1' => Because Taiga-UI Required It, So...
-                    Number(splitDate[0]) // Day
-                    );
+                    convertedValue = convertFormFieldTypeDateToStandardFormat(value);
                     break;
                 case EFieldType.RADIO:
-                    var fieldRadio = field;
-                    value = fieldRadio.options.find(function (item) {
-                        return item.label === fieldValue;
-                    });
+                    convertedValue = value.label;
+                default:
+                    break;
+            }
+        }
+        return convertedValue;
+    };
+    var convertFormFieldValueToKwikUIFormat = function (field, value) {
+        var convertedValue = value;
+        if (kwikidToolkit.isNotEmptyValue(value)) {
+            switch (field.type) {
+                case EFieldType.RADIO:
+                    if (!kwikidToolkit.checkObjectKeyExists(value, "label")) {
+                        var radioField = field;
+                        var convertedLabelValue = radioField.options.find(function (item) {
+                            return item.label === value;
+                        });
+                        convertedValue = convertedLabelValue;
+                    }
                     break;
-                case EFieldType.CHECKBOX:
-                    value = Boolean(fieldValue);
+                case EFieldType.DATE:
+                    convertedValue = convertFormFieldTypeDateToKwikUIFormat(value);
+                    break;
+                case EFieldType.TITLE:
                     break;
                 default:
-                    value = fieldValue;
                     break;
             }
         }
         else {
-            value = fieldValue;
+            convertedValue = convertFormFieldEmptyValueToKwikUIFormat(field);
         }
-        return value;
+        return convertedValue;
     };
-    var setEmptyValue = function (field) {
+    var convertFormFieldEmptyValueToKwikUIFormat = function (field) {
         var fieldType = field.type;
         var value;
         switch (fieldType) {
@@ -910,7 +814,7 @@
             this._previousFormData = previousFormData;
             this._takeAction = takeAction;
         }
-        Defaults.prototype.getDefaultValue = function () {
+        Defaults.prototype.getFormFieldValue = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var defaultValue, sources, sourceIndex, sources_1, sources_1_1, source, sources_2, value, validation, triggers, rules, actions, rulesMapping, actions_1, actions_1_1, action, conditionEvaluation, actions_2, e_1_1, e_2_1;
                 var e_2, _a, e_1, _b;
@@ -927,7 +831,7 @@
                         case 2:
                             if (!!sources_1_1.done) return [3 /*break*/, 12];
                             source = sources_1_1.value;
-                            sources_2 = new kwikidToolkit.Sources({
+                            sources_2 = new kwikidToolkit.Source({
                                 FIELD_CONFIG: this._field,
                                 FORM_FIELDS: this._formFields,
                                 FORM_DATA: this._formData,
@@ -936,12 +840,12 @@
                             });
                             value = sources_2.getValueFromSource(source);
                             // Set the Value of current source.
-                            this._field = setValueToObject(this._field, "default.value.sources.[" + sourceIndex + "].value", value);
+                            this._field = kwikidToolkit.setValueToObjectPath(this._field, "default.value.sources.[" + sourceIndex + "].value", value);
                             validation = source.validation;
                             triggers = validation.triggers;
                             rules = validation.rules;
                             actions = validation.actions;
-                            rulesMapping = new kwikidToolkit.Rules(rules, {
+                            rulesMapping = new kwikidToolkit.Rule(rules, {
                                 FIELD_CONFIG: this._field,
                                 FORM_FIELDS: this._formFields,
                                 FORM_DATA: this._formData,
@@ -958,7 +862,7 @@
                             action = actions_1_1.value;
                             conditionEvaluation = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
                             if (!conditionEvaluation) return [3 /*break*/, 6];
-                            actions_2 = new kwikidToolkit.Actions(action, rulesMapping, {
+                            actions_2 = new kwikidToolkit.Action(action, rulesMapping, {
                                 FIELD_CONFIG: this._field,
                                 FORM_FIELDS: this._formFields,
                                 FORM_DATA: this._formData,
@@ -1002,15 +906,15 @@
                             return [7 /*endfinally*/];
                         case 15:
                             defaultValue = this._field.default.value.value;
-                            if (isEmpty$1(defaultValue)) {
-                                defaultValue = setEmptyValue(this._field);
+                            if (kwikidToolkit.isEmptyValue(defaultValue)) {
+                                defaultValue = convertFormFieldEmptyValueToKwikUIFormat(this._field);
                             }
                             return [2 /*return*/, defaultValue];
                     }
                 });
             });
         };
-        Defaults.prototype.getDefaultDropdownOptions = function () {
+        Defaults.prototype.getFormFieldOptions = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var optionsConfig, rules, actions, rulesMapping, actions_3, actions_3_1, action, conditionEvaluation, actions_4, e_3_1;
                 var e_3, _a;
@@ -1020,7 +924,7 @@
                             optionsConfig = this._field.default.options;
                             rules = optionsConfig.rules;
                             actions = optionsConfig.actions;
-                            rulesMapping = new kwikidToolkit.Rules(rules, {
+                            rulesMapping = new kwikidToolkit.Rule(rules, {
                                 FIELD_CONFIG: this._field,
                                 FORM_FIELDS: this._formFields,
                                 FORM_DATA: this._formData,
@@ -1034,314 +938,49 @@
                             _b.label = 2;
                         case 2:
                             if (!!actions_3_1.done) return [3 /*break*/, 5];
-                            action = actions_3_1.value;
-                            conditionEvaluation = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
-                            if (!conditionEvaluation) return [3 /*break*/, 4];
-                            actions_4 = new kwikidToolkit.Actions(action, rulesMapping, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }, this._takeAction);
-                            return [4 /*yield*/, actions_4.execute()];
-                        case 3:
-                            _b.sent();
-                            _b.label = 4;
-                        case 4:
-                            actions_3_1 = actions_3.next();
-                            return [3 /*break*/, 2];
-                        case 5: return [3 /*break*/, 8];
-                        case 6:
-                            e_3_1 = _b.sent();
-                            e_3 = { error: e_3_1 };
-                            return [3 /*break*/, 8];
-                        case 7:
-                            try {
-                                if (actions_3_1 && !actions_3_1.done && (_a = actions_3.return)) _a.call(actions_3);
-                            }
-                            finally { if (e_3) throw e_3.error; }
-                            return [7 /*endfinally*/];
-                        case 8: return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        return Defaults;
-    }());
-    __decorate([
-        kwikidToolkit.logMethod
-    ], Defaults.prototype, "getDefaultValue", null);
-
-    var findFieldFromKey = function (fields, key) {
-        var field = fields.find(function (field) {
-            if (field.key === key) {
-                return field;
-            }
-        });
-        return field;
-    };
-    var findFieldIndexFromKey = function (fields, key) {
-        var fieldIndex;
-        fieldIndex = fields.findIndex(function (_) {
-            return key === _.key;
-        });
-        return fieldIndex;
-    };
-    var getSearchTextOptionsFromRemoteFile = function (field, childField, formGroup) { return __awaiter(void 0, void 0, void 0, function () {
-        var parentFieldValue, fileUrl, fileKey, response, data;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    parentFieldValue = formGroup.controls[field.key].value;
-                    if (childField.regexToGetJsonRemoteUrlKey) {
-                        fileKey = parentFieldValue.match(childField.regexToGetJsonRemoteUrlKey)[0];
-                        fileUrl = childField.jsonRemoteUrlMapping[fileKey];
-                    }
-                    else {
-                        fileUrl = childField.fileUrl;
-                    }
-                    // Return early if there is no file URL
-                    if (!fileUrl)
-                        return [2 /*return*/];
-                    return [4 /*yield*/, fetch(fileUrl)];
-                case 1:
-                    response = _a.sent();
-                    return [4 /*yield*/, response.json()];
-                case 2:
-                    data = _a.sent();
-                    // Return the data for the given parent field value
-                    return [2 /*return*/, data[parentFieldValue]];
-            }
-        });
-    }); };
-    var getSearchTextOptionsFromFieldConfig = function (field, childField, formGroup) {
-        var options;
-        var fieldValue = formGroup.controls[field.key].value;
-        if (kwikidToolkit.isNotEmptyValue(childField["json"])) {
-            options = childField["json"][fieldValue];
-        }
-        return options;
-    };
-    var formatSearchTextOptions = function (options) {
-        return options.map(function (_a) {
-            var title = _a.title;
-            return title;
-        });
-    };
-    function highlightFieldError(field, error) {
-        field.invalid = error;
-        field.focus = error;
-        // if (!error) {
-        //   field["messages"] = field["messages"].filter(function (fieldMessage: {
-        //     type: string;
-        //     message: string;
-        //   }) {
-        //     return fieldMessage.type === "error";
-        //   });
-        // }
-        return field;
-    }
-    var addMessage = function (field, message) {
-        var isDuplicateMessage = function (messages, message) {
-            return messages.some(function (fieldMessage) {
-                return (fieldMessage.type === message.type &&
-                    fieldMessage.message === message.message);
-            });
-        };
-        field["messages"] = [];
-        if (kwikidToolkit.checkObjectKeyExists(field, "messages")) {
-            if (!isDuplicateMessage(field["messages"], message)) {
-                field["messages"].push({
-                    type: message.type,
-                    message: message.message
-                });
-            }
-        }
-        else {
-            field["messages"] = [{ type: message.type, message: message.message }];
-        }
-        return field;
-    };
-    var removeMessage = function (field, message) {
-        field["messages"] = field["messages"].filter(function (fieldMessage) {
-            return fieldMessage.type !== message.type;
-        });
-        return field;
-    };
-    function setFieldError(fields, errors, key, error) {
-        var fieldIndex = fields.findIndex(function (field) {
-            return field.key === key;
-        });
-        var setErrorMessages = function (field, errors) {
-            var getErrorMessage = function (fieldLabel, errorType) {
-                var errorMessage = "";
-                switch (errorType) {
-                    case "required":
-                        errorMessage = fieldLabel + " is required!";
-                        break;
-                    case "email":
-                        errorMessage = fieldLabel + " has wrong email format!";
-                        break;
-                    case "min":
-                        errorMessage = fieldLabel + " has wrong value! Minimum value: " + field.validators.min;
-                        break;
-                    case "minlength":
-                        errorMessage = fieldLabel + " has wrong length! Required minimum length: " + field.validators.minLength;
-                        break;
-                    case "max":
-                        errorMessage = fieldLabel + " has wrong value! Maximum value: " + field.validators.maxLength;
-                        break;
-                    case "maxlength":
-                        errorMessage = fieldLabel + " has wrong length! Required maximum length: " + field.validators.maxLength;
-                        break;
-                    case "areEqual":
-                        errorMessage = fieldLabel + " must be equal!";
-                        break;
-                    case "pattern":
-                        errorMessage = fieldLabel + " is in incorrect format!";
-                        break;
-                    default:
-                        errorMessage = fieldLabel + ": " + errorType;
-                        break;
-                }
-                return errorMessage;
-            };
-            Object.keys(errors).forEach(function (error) {
-                field = addMessage(field, {
-                    type: "error",
-                    message: getErrorMessage(field.label, error)
-                });
-            });
-            return field;
-        };
-        if (error) {
-            fields[fieldIndex] = setErrorMessages(fields[fieldIndex], errors);
-        }
-        else {
-            fields[fieldIndex]["messages"] = [];
-        }
-        fields[fieldIndex] = highlightFieldError(fields[fieldIndex], error);
-        return fields;
-    }
-    var convertDateStringToTuiDayFormat = function (date) {
-        var splitDate = date.split("-");
-        var tuiDay = new cdk.TuiDay(Number(splitDate[2]), // Year
-        Number(splitDate[1]) - 1, // Month, Why '-1' => Because Taiga-UI Required It, So...
-        Number(splitDate[0]) // Day
-        );
-        return tuiDay;
-    };
-    var convertTuiDayFormatToDateString = function (date) {
-        var formattedDate;
-        var year = date.year;
-        var month = date.month;
-        var day = date.day;
-        formattedDate = day.toString().padStart(2, "0") + "-" + (month + 1)
-            .toString()
-            .padStart(2, "0") + "-" + year;
-        return formattedDate;
-    };
-    var convertValueFromKwikUIFormatToBasicFormat = function (field, value) {
-        var convertedValue = value;
-        if (kwikidToolkit.isNotEmptyValue(value)) {
-            switch (field.type) {
-                case EFieldType.DATE:
-                    convertedValue = convertTuiDayFormatToDateString(value);
-                    break;
-                case EFieldType.RADIO:
-                    convertedValue = value.label;
-                default:
-                    break;
-            }
-        }
-        return convertedValue;
-    };
-    var convertValueFromBasicFormatToKwikUIFormat = function (field, value) {
-        var convertedValue = value;
-        if (kwikidToolkit.isNotEmptyValue(value)) {
-            switch (field.type) {
-                case EFieldType.RADIO:
-                    if (!kwikidToolkit.checkObjectKeyExists(value, "label")) {
-                        var radioField = field;
-                        var convertedLabelValue = radioField.options.find(function (item) {
-                            return item.label === value;
-                        });
-                        convertedValue = convertedLabelValue;
+                            action = actions_3_1.value;
+                            conditionEvaluation = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
+                            if (!conditionEvaluation) return [3 /*break*/, 4];
+                            actions_4 = new kwikidToolkit.Action(action, rulesMapping, {
+                                FIELD_CONFIG: this._field,
+                                FORM_FIELDS: this._formFields,
+                                FORM_DATA: this._formData,
+                                PREVIOUS_FORM_DATA: this._previousFormData,
+                                ALL_FORMS_DATA: this._allFormsData
+                            }, this._takeAction);
+                            return [4 /*yield*/, actions_4.execute()];
+                        case 3:
+                            _b.sent();
+                            _b.label = 4;
+                        case 4:
+                            actions_3_1 = actions_3.next();
+                            return [3 /*break*/, 2];
+                        case 5: return [3 /*break*/, 8];
+                        case 6:
+                            e_3_1 = _b.sent();
+                            e_3 = { error: e_3_1 };
+                            return [3 /*break*/, 8];
+                        case 7:
+                            try {
+                                if (actions_3_1 && !actions_3_1.done && (_a = actions_3.return)) _a.call(actions_3);
+                            }
+                            finally { if (e_3) throw e_3.error; }
+                            return [7 /*endfinally*/];
+                        case 8: return [2 /*return*/];
                     }
-                    break;
-                case EFieldType.DATE:
-                    convertedValue = convertDateStringToTuiDayFormat(value);
-                    break;
-                case EFieldType.TITLE:
-                    break;
-                default:
-                    break;
-            }
-        }
-        return convertedValue;
-    };
+                });
+            });
+        };
+        return Defaults;
+    }());
+    __decorate([
+        kwikidToolkit.logMethod
+    ], Defaults.prototype, "getFormFieldValue", null);
 
-    var Validations = /** @class */ (function () {
-        function Validations(field, formFields, formData, previousFormData, allFormsData, takeAction) {
-            this._field = field;
-            this._formFields = formFields;
-            this._formData = formData;
-            this._previousFormData = previousFormData;
-            this._allFormsData = allFormsData;
-            this._takeAction = takeAction;
+    var FormValidation = /** @class */ (function () {
+        function FormValidation() {
         }
-        Object.defineProperty(Validations.prototype, "formData", {
-            get: function () {
-                return this._formData;
-            },
-            set: function (value) {
-                this._formData = value;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Validations.prototype, "previousFormData", {
-            get: function () {
-                return this._previousFormData;
-            },
-            set: function (value) {
-                this._previousFormData = value;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Validations.prototype, "allFormsData", {
-            get: function () {
-                return this._allFormsData;
-            },
-            set: function (value) {
-                this._allFormsData = value;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Validations.prototype, "field", {
-            get: function () {
-                return this._field;
-            },
-            set: function (value) {
-                this._field = value;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Validations.prototype, "formFields", {
-            get: function () {
-                return this._formFields;
-            },
-            set: function (value) {
-                this._formFields = value;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Validations.prototype.getFieldValidators = function (field) {
+        FormValidation.prototype.getFormFieldValidators = function (field) {
             var validators = [];
             if (kwikidToolkit.checkObjectKeyExists(field, "validators") &&
                 kwikidToolkit.checkObjectKeyExists(field.validators, "min") &&
@@ -1373,20 +1012,20 @@
                 kwikidToolkit.checkObjectKeyExists(field.validators, "pattern") &&
                 kwikidToolkit.isNotEmptyValue(field.validators.pattern)) {
                 if (kwikidToolkit.checkObjectKeyExists(field.validators.pattern, "key")) {
-                    if (field.validators.pattern.key === EPatternKey.CUSTOM) {
+                    if (field.validators.pattern.key === "CUSTOM") {
                         validators.push(i6.Validators.pattern(field.validators.pattern.pattern));
                     }
                     else {
-                        validators.push(i6.Validators.pattern(EPattern[field.validators.pattern.key]));
+                        validators.push(i6.Validators.pattern(kwikidToolkit.PATTERNS[field.validators.pattern.key]));
                     }
                 }
             }
             return validators;
         };
-        Validations.prototype.getFormValidationErrors = function (control) {
+        FormValidation.prototype.getFormFieldsValidationErrors = function (formGroup) {
             var errors = [];
             var _loop_1 = function (key) {
-                var controlErrors = control.controls[key].errors;
+                var controlErrors = formGroup.controls[key].errors;
                 if (controlErrors !== null && controlErrors !== undefined) {
                     Object.keys(controlErrors).forEach(function (keyError) {
                         errors.push({
@@ -1396,12 +1035,12 @@
                     });
                 }
             };
-            for (var key in control.controls) {
+            for (var key in formGroup.controls) {
                 _loop_1(key);
             }
             return errors;
         };
-        Validations.prototype.findInvalidControlsRecursive = function (formToInvestigate) {
+        FormValidation.prototype.getFormFieldsInvalidControls = function (formToInvestigate) {
             var controls = [];
             var recursiveFunc = function (form) {
                 Object.keys(form.controls).forEach(function (field) {
@@ -1429,78 +1068,17 @@
             recursiveFunc(formToInvestigate);
             return controls;
         };
-        Validations.prototype.validateField = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                var validations, triggers, rules, actions, rulesMapping, actions_1, actions_1_1, action, conditionEvaluation, actions_2, e_1_1;
-                var e_1, _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            validations = this._field.validation;
-                            triggers = validations.triggers;
-                            rules = validations.rules;
-                            actions = validations.actions;
-                            rulesMapping = new kwikidToolkit.Rules(rules, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }).mapping();
-                            _b.label = 1;
-                        case 1:
-                            _b.trys.push([1, 6, 7, 8]);
-                            actions_1 = __values(actions), actions_1_1 = actions_1.next();
-                            _b.label = 2;
-                        case 2:
-                            if (!!actions_1_1.done) return [3 /*break*/, 5];
-                            action = actions_1_1.value;
-                            conditionEvaluation = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
-                            if (!conditionEvaluation) return [3 /*break*/, 4];
-                            actions_2 = new kwikidToolkit.Actions(action, rulesMapping, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }, this._takeAction);
-                            return [4 /*yield*/, actions_2.execute()];
-                        case 3:
-                            _b.sent();
-                            _b.label = 4;
-                        case 4:
-                            actions_1_1 = actions_1.next();
-                            return [3 /*break*/, 2];
-                        case 5: return [3 /*break*/, 8];
-                        case 6:
-                            e_1_1 = _b.sent();
-                            e_1 = { error: e_1_1 };
-                            return [3 /*break*/, 8];
-                        case 7:
-                            try {
-                                if (actions_1_1 && !actions_1_1.done && (_a = actions_1.return)) _a.call(actions_1);
-                            }
-                            finally { if (e_1) throw e_1.error; }
-                            return [7 /*endfinally*/];
-                        case 8: return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        return Validations;
+        return FormValidation;
     }());
     __decorate([
         kwikidToolkit.logMethod
-    ], Validations.prototype, "getFieldValidators", null);
-    __decorate([
-        kwikidToolkit.logMethod
-    ], Validations.prototype, "getFormValidationErrors", null);
+    ], FormValidation.prototype, "getFormFieldValidators", null);
     __decorate([
         kwikidToolkit.logMethod
-    ], Validations.prototype, "findInvalidControlsRecursive", null);
+    ], FormValidation.prototype, "getFormFieldsValidationErrors", null);
     __decorate([
         kwikidToolkit.logMethod
-    ], Validations.prototype, "validateField", null);
+    ], FormValidation.prototype, "getFormFieldsInvalidControls", null);
 
     var KwikIDFormViewService = /** @class */ (function () {
         function KwikIDFormViewService() {
@@ -1524,11 +1102,11 @@
                             field = fields_1_1.value;
                             if (!field.isFormElement) return [3 /*break*/, 4];
                             defaults = new Defaults(field, fields, allFormsData, formData, previousFormData, takeAction);
-                            return [4 /*yield*/, defaults.getDefaultValue()];
+                            return [4 /*yield*/, defaults.getFormFieldValue()];
                         case 3:
                             value = _b.sent();
-                            value = convertValueFromBasicFormatToKwikUIFormat(field, value);
-                            validators = new Validations(field, fields, formData, previousFormData, allFormsData, takeAction).getFieldValidators(field);
+                            value = convertFormFieldValueToKwikUIFormat(field, value);
+                            validators = new FormValidation().getFormFieldValidators(field);
                             formGroup.addControl(field.key, new i6.FormControl({ value: value, disabled: field.disabled }, { validators: validators }));
                             _b.label = 4;
                         case 4:
@@ -1557,19 +1135,25 @@
     ], KwikIDFormViewService.prototype, "createFormGroup", null);
 
     var Apis = /** @class */ (function () {
-        function Apis(field, formFields, formData, previousFormData, allFormsData, takeAction) {
-            this._field = field;
-            this._formFields = formFields;
-            this._formData = formData;
-            this._previousFormData = previousFormData;
-            this._allFormsData = allFormsData;
+        function Apis(object, takeAction) {
+            this._object = object;
             this._takeAction = takeAction;
-            this._api = field.api;
-            this._request = field.api.request;
-            this._response = field.api.response;
-            this._status = field.api.status;
+            this._api = this._object.FIELD_CONFIG.api;
+            this._request = this._object.FIELD_CONFIG.api.request;
+            this._response = this._object.FIELD_CONFIG.api.response;
+            this._status = this._object.FIELD_CONFIG.api.status;
         }
-        Apis.prototype.setRequestBodyParams = function () {
+        Object.defineProperty(Apis.prototype, "object", {
+            get: function () {
+                return this._object;
+            },
+            set: function (value) {
+                this._object = value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Apis.prototype.setRequestBody = function () {
             var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function () {
                 var params, paramIndex, params_1, params_1_1, param, sources, sourceIndex, sources_1, sources_1_1, source, sources_2, value, validation, triggers, rules, actions, rulesMapping, actions_1, actions_1_1, action, conditionEvaluation, actions_2, e_1_1, e_2_1, e_3_1;
@@ -1597,27 +1181,15 @@
                         case 4:
                             if (!!sources_1_1.done) return [3 /*break*/, 14];
                             source = sources_1_1.value;
-                            sources_2 = new kwikidToolkit.Sources({
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            });
+                            sources_2 = new kwikidToolkit.Source(this._object);
                             value = sources_2.getValueFromSource(source);
                             // Set the Value of current source.
-                            this._field = setValueToObject(this._field, "api.request.body.params[" + paramIndex + "].sources[" + sourceIndex + "].value", value);
+                            this._object.FIELD_CONFIG = kwikidToolkit.setValueToObjectPath(this._object.FIELD_CONFIG, "api.request.body.params[" + paramIndex + "].sources[" + sourceIndex + "].value", value);
                             validation = source.validation;
                             triggers = (_a = validation === null || validation === void 0 ? void 0 : validation.triggers) !== null && _a !== void 0 ? _a : [];
                             rules = (_b = validation === null || validation === void 0 ? void 0 : validation.rules) !== null && _b !== void 0 ? _b : [];
                             actions = (_d = (_c = validation) === null || _c === void 0 ? void 0 : _c.actions) !== null && _d !== void 0 ? _d : [];
-                            rulesMapping = new kwikidToolkit.Rules(rules, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }).mapping();
+                            rulesMapping = new kwikidToolkit.Rule(rules, this._object).mapping();
                             _h.label = 5;
                         case 5:
                             _h.trys.push([5, 10, 11, 12]);
@@ -1628,13 +1200,7 @@
                             action = actions_1_1.value;
                             conditionEvaluation = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
                             if (!conditionEvaluation) return [3 /*break*/, 8];
-                            actions_2 = new kwikidToolkit.Actions(action, rulesMapping, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }, this._takeAction);
+                            actions_2 = new kwikidToolkit.Action(action, rulesMapping, this._object, this._takeAction);
                             return [4 /*yield*/, actions_2.execute()];
                         case 7:
                             _h.sent();
@@ -1687,7 +1253,7 @@
                             }
                             finally { if (e_3) throw e_3.error; }
                             return [7 /*endfinally*/];
-                        case 22: return [2 /*return*/, this._field];
+                        case 22: return [2 /*return*/, this._object.FIELD_CONFIG];
                     }
                 });
             });
@@ -1705,13 +1271,7 @@
                             triggers = validation.triggers;
                             rules = validation.rules;
                             actions = (_a = validation) === null || _a === void 0 ? void 0 : _a.actions;
-                            rulesMapping = new kwikidToolkit.Rules(rules, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }).mapping();
+                            rulesMapping = new kwikidToolkit.Rule(rules, this._object).mapping();
                             _f.label = 1;
                         case 1:
                             _f.trys.push([1, 6, 7, 8]);
@@ -1722,13 +1282,7 @@
                             action = actions_3_1.value;
                             conditionSuccess = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
                             if (!conditionSuccess) return [3 /*break*/, 4];
-                            actions_4 = new kwikidToolkit.Actions(action, rulesMapping, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }, this._takeAction);
+                            actions_4 = new kwikidToolkit.Action(action, rulesMapping, this._object, this._takeAction);
                             return [4 /*yield*/, actions_4.execute()];
                         case 3:
                             _f.sent();
@@ -1747,12 +1301,12 @@
                             }
                             finally { if (e_4) throw e_4.error; }
                             return [7 /*endfinally*/];
-                        case 8: return [2 /*return*/, this._field];
+                        case 8: return [2 /*return*/, this._object.FIELD_CONFIG];
                     }
                 });
             });
         };
-        Apis.prototype.validateApiCallResponse = function () {
+        Apis.prototype.validateResponse = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var validation, triggers, rules, actions, rulesMapping, actions_5, actions_5_1, action, conditionSuccess, actions_6, e_5_1;
                 var e_5, _e;
@@ -1763,13 +1317,7 @@
                             triggers = validation.triggers;
                             rules = validation.rules;
                             actions = validation.actions;
-                            rulesMapping = new kwikidToolkit.Rules(rules, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }).mapping();
+                            rulesMapping = new kwikidToolkit.Rule(rules, this._object).mapping();
                             _f.label = 1;
                         case 1:
                             _f.trys.push([1, 6, 7, 8]);
@@ -1780,13 +1328,7 @@
                             action = actions_5_1.value;
                             conditionSuccess = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
                             if (!conditionSuccess) return [3 /*break*/, 4];
-                            actions_6 = new kwikidToolkit.Actions(action, rulesMapping, {
-                                FIELD_CONFIG: this._field,
-                                FORM_FIELDS: this._formFields,
-                                FORM_DATA: this._formData,
-                                PREVIOUS_FORM_DATA: this._previousFormData,
-                                ALL_FORMS_DATA: this._allFormsData
-                            }, this._takeAction);
+                            actions_6 = new kwikidToolkit.Action(action, rulesMapping, this._object, this._takeAction);
                             return [4 /*yield*/, actions_6.execute()];
                         case 3:
                             _f.sent();
@@ -1805,31 +1347,22 @@
                             }
                             finally { if (e_5) throw e_5.error; }
                             return [7 /*endfinally*/];
-                        case 8: return [2 /*return*/, this._field];
+                        case 8: return [2 /*return*/, this._object.FIELD_CONFIG];
                     }
                 });
             });
         };
-        Apis.prototype.getPropsValues = function () {
-            return {
-                field: this._field,
-                formFields: this._formFields,
-                formData: this._formData,
-                previousFormData: this._previousFormData,
-                allFormsData: this._allFormsData
-            };
-        };
         return Apis;
     }());
     __decorate([
         kwikidToolkit.logMethod
-    ], Apis.prototype, "setRequestBodyParams", null);
+    ], Apis.prototype, "setRequestBody", null);
     __decorate([
         kwikidToolkit.logMethod
     ], Apis.prototype, "validateRequestBody", null);
     __decorate([
         kwikidToolkit.logMethod
-    ], Apis.prototype, "validateApiCallResponse", null);
+    ], Apis.prototype, "validateResponse", null);
 
     /**
      * Generated class for the SafeHtmlPipe pipe.
@@ -1910,12 +1443,18 @@
                 this.formGroup.patchValue((_b = {},
                     _b[this.apiCallResponse.key] = this.apiCallResponse.response,
                     _b), { emitEvent: false });
-                var field_1 = findFieldFromKey(this.formFields, this.apiCallResponse.key);
-                var apis_1 = new Apis(field_1, this.formFields, this.formData, this.previousFormData, this.allFormsData, this.takeAction.bind(this));
+                var field_1 = getFormFieldByKey(this.formFields, this.apiCallResponse.key);
+                var apis_1 = new Apis({
+                    FIELD_CONFIG: field_1,
+                    FORM_FIELDS: this.formFields,
+                    FORM_DATA: this.formData,
+                    PREVIOUS_FORM_DATA: this.previousFormData,
+                    ALL_FORMS_DATA: this.allFormsData
+                }, this.takeAction.bind(this));
                 (function () { return __awaiter(_this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
                         switch (_a.label) {
-                            case 0: return [4 /*yield*/, apis_1.validateApiCallResponse()];
+                            case 0: return [4 /*yield*/, apis_1.validateResponse()];
                             case 1:
                                 field_1 = _a.sent();
                                 return [2 /*return*/];
@@ -1964,14 +1503,14 @@
                             _loop_1 = function (field) {
                                 var _j;
                                 if (field.isFormElement) {
-                                    this_1.previousFormData = Object.assign(Object.assign({}, this_1.previousFormData), (_j = {}, _j[field.key] = this_1.formGroup.controls[field.key].value, _j));
+                                    this_1.previousFormData = Object.assign(Object.assign({}, this_1.previousFormData), (_j = {}, _j[field.key] = convertFormFieldValueToStandardFormat(field, this_1.formGroup.controls[field.key].value), _j));
                                     this_1.formGroup.controls[field.key].valueChanges
                                         .pipe(operators.pairwise())
                                         .subscribe(function (_a) {
                                         var _b, _c;
                                         var _d = __read(_a, 2), previousValue = _d[0], currentValue = _d[1];
-                                        _this.previousFormData = Object.assign(Object.assign({}, _this.previousFormData), (_b = {}, _b[field.key] = previousValue, _b));
-                                        _this.formData = Object.assign(Object.assign({}, _this.formData), (_c = {}, _c[field.key] = currentValue, _c));
+                                        _this.previousFormData = Object.assign(Object.assign({}, _this.previousFormData), (_b = {}, _b[field.key] = convertFormFieldValueToStandardFormat(field, previousValue), _b));
+                                        _this.formData = Object.assign(Object.assign({}, _this.formData), (_c = {}, _c[field.key] = convertFormFieldValueToStandardFormat(field, currentValue), _c));
                                     });
                                 }
                             };
@@ -1996,11 +1535,17 @@
                                         case 0:
                                             if (!field.isFormElement) return [3 /*break*/, 2];
                                             if (field.validation.triggers.includes("ON_INIT")) {
-                                                validations_1 = new Validations(field, this_2.formFields, this_2.formData, this_2.previousFormData, this_2.allFormsData, this_2.takeAction.bind(this_2));
+                                                validations_1 = new kwikidToolkit.Validation({
+                                                    FIELD_CONFIG: field,
+                                                    FORM_FIELDS: this_2.formFields,
+                                                    FORM_DATA: this_2.formData,
+                                                    PREVIOUS_FORM_DATA: this_2.previousFormData,
+                                                    ALL_FORMS_DATA: this_2.allFormsData
+                                                }, this_2.takeAction.bind(this_2));
                                                 (function () { return __awaiter(_this, void 0, void 0, function () {
                                                     return __generator(this, function (_a) {
                                                         switch (_a.label) {
-                                                            case 0: return [4 /*yield*/, validations_1.validateField()];
+                                                            case 0: return [4 /*yield*/, validations_1.validate(field.validation)];
                                                             case 1:
                                                                 _a.sent();
                                                                 return [2 /*return*/];
@@ -2009,18 +1554,16 @@
                                                 }); })();
                                             }
                                             if (kwikidToolkit.checkObjectKeyExists(field, "connectedElements")) {
-                                                if (kwikidToolkit.checkObjectKeyExists(field.connectedElements, "connectedFields")) {
-                                                    this_2.handleConnectedElements({
-                                                        key: field.key,
-                                                        value: this_2.formGroup.controls[field.key].value
-                                                    }, "ON_INIT");
-                                                }
+                                                this_2.handleConnectedElements({
+                                                    key: field.key,
+                                                    value: this_2.formGroup.controls[field.key].value
+                                                }, "ON_INIT");
                                             }
                                             if (!kwikidToolkit.checkObjectKeyExists(field, "default")) return [3 /*break*/, 2];
                                             if (!kwikidToolkit.checkObjectKeyExists(field.default, "options")) return [3 /*break*/, 2];
                                             if (!field.default.options.triggers.includes("ON_INIT")) return [3 /*break*/, 2];
                                             defaults = new Defaults(field, this_2.formFields, this_2.allFormsData, this_2.formData, this_2.previousFormData, this_2.takeAction);
-                                            return [4 /*yield*/, defaults.getDefaultDropdownOptions()];
+                                            return [4 /*yield*/, defaults.getFormFieldOptions()];
                                         case 1:
                                             _k.sent();
                                             _k.label = 2;
@@ -2088,7 +1631,7 @@
                     switch (_d.label) {
                         case 0:
                             if (!kwikidToolkit.checkObjectKeyExists(childFieldGroupConfig, "rules")) return [3 /*break*/, 8];
-                            rulesMapping = new kwikidToolkit.Rules(childFieldGroupConfig.rules, {
+                            rulesMapping = new kwikidToolkit.Rule(childFieldGroupConfig.rules, {
                                 FIELD_CONFIG: parentField,
                                 FORM_DATA: this.formData,
                                 PREVIOUS_FORM_DATA: this.previousFormData,
@@ -2104,7 +1647,7 @@
                             action = _b.value;
                             conditionSuccess = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
                             if (!conditionSuccess) return [3 /*break*/, 4];
-                            actions = new kwikidToolkit.Actions(action, rulesMapping, {
+                            actions = new kwikidToolkit.Action(action, rulesMapping, {
                                 FIELD_CONFIG: parentField,
                                 FORM_FIELDS: this.formFields,
                                 FORM_DATA: this.formData,
@@ -2158,7 +1701,7 @@
                     switch (_d.label) {
                         case 0:
                             if (!kwikidToolkit.checkObjectKeyExists(connectedFieldConfig, "rules")) return [3 /*break*/, 8];
-                            rulesMapping = new kwikidToolkit.Rules(connectedFieldConfig.rules, {
+                            rulesMapping = new kwikidToolkit.Rule(connectedFieldConfig.rules, {
                                 FIELD_CONFIG: connectedField,
                                 FORM_DATA: this.formData,
                                 PREVIOUS_FORM_DATA: this.previousFormData,
@@ -2174,7 +1717,7 @@
                             action = _b.value;
                             conditionSuccess = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
                             if (!conditionSuccess) return [3 /*break*/, 4];
-                            actions = new kwikidToolkit.Actions(action, rulesMapping, {
+                            actions = new kwikidToolkit.Action(action, rulesMapping, {
                                 FORM_FIELDS: this.formFields,
                                 FIELD_CONFIG: connectedField,
                                 FORM_DATA: this.formData,
@@ -2206,40 +1749,20 @@
         };
         KwikIDFormViewComponent.prototype.handleConnectedElementFields = function (currentField, connectedFieldConfig, eventType, nested) {
             return __awaiter(this, void 0, void 0, function () {
-                var connectedField, _a, _b, connectedFieldConfig_1;
-                var e_5, _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var connectedField;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            connectedField = findFieldFromKey(this.formFields, connectedFieldConfig["key"]);
+                            connectedField = getFormFieldByKey(this.formFields, connectedFieldConfig["key"]);
                             if (!kwikidToolkit.checkObjectKeyExists(connectedFieldConfig, "triggers")) return [3 /*break*/, 2];
                             if (!connectedFieldConfig.triggers.includes(eventType)) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.handleConnectedElementFieldActions(connectedFieldConfig, connectedField)];
                         case 1:
-                            connectedField = _d.sent();
-                            _d.label = 2;
+                            connectedField = _a.sent();
+                            _a.label = 2;
                         case 2:
                             if (kwikidToolkit.checkObjectKeyExists(connectedFieldConfig, "handleNestedFields")) {
-                                if (connectedFieldConfig.handleNestedFields) {
-                                    if (kwikidToolkit.checkObjectKeyExists(connectedField, "connectedElements")) {
-                                        if (kwikidToolkit.checkObjectKeyExists(connectedField.connectedElements, "connectedFields")) {
-                                            try {
-                                                for (_a = __values(connectedField.connectedElements
-                                                    .connectedFields), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                                    connectedFieldConfig_1 = _b.value;
-                                                    connectedField = this.handleConnectedElementFields(connectedField, connectedFieldConfig_1, eventType, "NESTED");
-                                                }
-                                            }
-                                            catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                                            finally {
-                                                try {
-                                                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                                                }
-                                                finally { if (e_5) throw e_5.error; }
-                                            }
-                                        }
-                                    }
-                                }
+                                this.handleConnectedElements({ key: connectedFieldConfig.key }, eventType);
                             }
                             return [2 /*return*/, currentField];
                     }
@@ -2248,12 +1771,12 @@
         };
         KwikIDFormViewComponent.prototype.handleConnectedElements = function (e, eventType) {
             return __awaiter(this, void 0, void 0, function () {
-                var currentField, connectedFieldGroups, connectedFieldGroups_1, connectedFieldGroups_1_1, connectedFieldGroupConfig, e_6_1, connectedFields, connectedFields_1, connectedFields_1_1, connectedFieldConfig, e_7_1;
-                var e_6, _a, e_7, _b;
+                var currentField, connectedFieldGroups, connectedFieldGroups_1, connectedFieldGroups_1_1, connectedFieldGroupConfig, e_5_1, connectedFields, connectedFields_1, connectedFields_1_1, connectedFieldConfig, e_6_1;
+                var e_5, _a, e_6, _b;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            currentField = findFieldFromKey(this.formFields, e.key);
+                            currentField = getFormFieldByKey(this.formFields, e.key);
                             if (!(currentField !== undefined)) return [3 /*break*/, 17];
                             if (!kwikidToolkit.checkObjectKeyExists(currentField, "connectedElements")) return [3 /*break*/, 16];
                             if (!kwikidToolkit.checkObjectKeyExists(currentField.connectedElements, "connectedFieldGroups")) return [3 /*break*/, 8];
@@ -2275,14 +1798,14 @@
                             return [3 /*break*/, 2];
                         case 5: return [3 /*break*/, 8];
                         case 6:
-                            e_6_1 = _c.sent();
-                            e_6 = { error: e_6_1 };
+                            e_5_1 = _c.sent();
+                            e_5 = { error: e_5_1 };
                             return [3 /*break*/, 8];
                         case 7:
                             try {
                                 if (connectedFieldGroups_1_1 && !connectedFieldGroups_1_1.done && (_a = connectedFieldGroups_1.return)) _a.call(connectedFieldGroups_1);
                             }
-                            finally { if (e_6) throw e_6.error; }
+                            finally { if (e_5) throw e_5.error; }
                             return [7 /*endfinally*/];
                         case 8:
                             if (!kwikidToolkit.checkObjectKeyExists(currentField.connectedElements, "connectedFields")) return [3 /*break*/, 16];
@@ -2304,14 +1827,14 @@
                             return [3 /*break*/, 10];
                         case 13: return [3 /*break*/, 16];
                         case 14:
-                            e_7_1 = _c.sent();
-                            e_7 = { error: e_7_1 };
+                            e_6_1 = _c.sent();
+                            e_6 = { error: e_6_1 };
                             return [3 /*break*/, 16];
                         case 15:
                             try {
                                 if (connectedFields_1_1 && !connectedFields_1_1.done && (_b = connectedFields_1.return)) _b.call(connectedFields_1);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_6) throw e_6.error; }
                             return [7 /*endfinally*/];
                         case 16: return [3 /*break*/, 18];
                         case 17: throw new Error("Field for the given key ['" + e.key + "'] is not found with eventType: '" + eventType + "'.");
@@ -2327,15 +1850,21 @@
             this.formGroup.patchValue((_a = {},
                 _a[e.key] = e.value,
                 _a), { emitEvent: false });
-            // Currently set only for dropdown-with-search connected fields
-            var field = findFieldFromKey(this.formFields, e.key);
+            var field = getFormFieldByKey(this.formFields, e.key);
+            this.formData[e.key] = convertFormFieldValueToStandardFormat(field, e.value);
             if (field.isFormElement &&
                 field.validation.triggers.includes("ON_CHANGE")) {
-                var validations_2 = new Validations(field, this.formFields, this.formData, this.previousFormData, this.allFormsData, this.takeAction.bind(this));
+                var validations_2 = new kwikidToolkit.Validation({
+                    FIELD_CONFIG: field,
+                    FORM_FIELDS: this.formFields,
+                    FORM_DATA: this.formData,
+                    PREVIOUS_FORM_DATA: this.previousFormData,
+                    ALL_FORMS_DATA: this.allFormsData
+                }, this.takeAction.bind(this));
                 (function () { return __awaiter(_this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
                         switch (_a.label) {
-                            case 0: return [4 /*yield*/, validations_2.validateField()];
+                            case 0: return [4 /*yield*/, validations_2.validate(field.validation)];
                             case 1:
                                 _a.sent();
                                 return [2 /*return*/];
@@ -2345,18 +1874,16 @@
             }
             if (field.isFormElement &&
                 kwikidToolkit.checkObjectKeyExists(field, "connectedElements")) {
-                if (kwikidToolkit.checkObjectKeyExists(field.connectedElements, "connectedFields")) {
-                    this.handleConnectedElements({
-                        key: field.key,
-                        value: this.formGroup.controls[field.key].value
-                    }, "ON_CHANGE");
-                }
+                this.handleConnectedElements({
+                    key: field.key,
+                    value: this.formGroup.controls[field.key].value
+                }, "ON_CHANGE");
             }
         };
         KwikIDFormViewComponent.prototype.handleOnClickResetFormFields = function (e, field) {
             return __awaiter(this, void 0, void 0, function () {
-                var _a, _b, f, _c, _d, action, resetField, actions, e_8_1, e_9_1;
-                var e_9, _e, e_8, _f;
+                var _a, _b, f, _c, _d, action, resetField, actions, e_7_1, e_8_1;
+                var e_8, _e, e_7, _f;
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
@@ -2369,13 +1896,13 @@
                             _g.label = 2;
                         case 2:
                             _g.trys.push([2, 7, 8, 9]);
-                            _c = (e_8 = void 0, __values(f.actions)), _d = _c.next();
+                            _c = (e_7 = void 0, __values(f.actions)), _d = _c.next();
                             _g.label = 3;
                         case 3:
                             if (!!_d.done) return [3 /*break*/, 6];
                             action = _d.value;
-                            resetField = findFieldFromKey(this.formFields, action.props.fieldKey);
-                            actions = new kwikidToolkit.Actions(action, {}, {
+                            resetField = getFormFieldByKey(this.formFields, action.props.fieldKey);
+                            actions = new kwikidToolkit.Action(action, {}, {
                                 FIELD_CONFIG: resetField,
                                 FORM_FIELDS: this.formFields,
                                 FORM_DATA: this.formData,
@@ -2391,28 +1918,28 @@
                             return [3 /*break*/, 3];
                         case 6: return [3 /*break*/, 9];
                         case 7:
-                            e_8_1 = _g.sent();
-                            e_8 = { error: e_8_1 };
+                            e_7_1 = _g.sent();
+                            e_7 = { error: e_7_1 };
                             return [3 /*break*/, 9];
                         case 8:
                             try {
                                 if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                             }
-                            finally { if (e_8) throw e_8.error; }
+                            finally { if (e_7) throw e_7.error; }
                             return [7 /*endfinally*/];
                         case 9:
                             _b = _a.next();
                             return [3 /*break*/, 1];
                         case 10: return [3 /*break*/, 13];
                         case 11:
-                            e_9_1 = _g.sent();
-                            e_9 = { error: e_9_1 };
+                            e_8_1 = _g.sent();
+                            e_8 = { error: e_8_1 };
                             return [3 /*break*/, 13];
                         case 12:
                             try {
                                 if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                             }
-                            finally { if (e_9) throw e_9.error; }
+                            finally { if (e_8) throw e_8.error; }
                             return [7 /*endfinally*/];
                         case 13: return [2 /*return*/];
                     }
@@ -2425,7 +1952,7 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            field = findFieldFromKey(this.formFields, e.key);
+                            field = getFormFieldByKey(this.formFields, e.key);
                             if (!(field.type === "api-call")) return [3 /*break*/, 3];
                             // set button status to loading
                             field["api"]["status"]["value"] = EApiStatusType.LOADING;
@@ -2434,8 +1961,14 @@
                             this.viewFormsButton["showLoader"] = true;
                             this.saveFormButton["disabled"] = true;
                             this.saveFormButton["showLoader"] = true;
-                            apis = new Apis(field, this.formFields, this.formData, this.previousFormData, this.allFormsData, this.takeAction.bind(this));
-                            return [4 /*yield*/, apis.setRequestBodyParams()];
+                            apis = new Apis({
+                                FIELD_CONFIG: field,
+                                FORM_FIELDS: this.formFields,
+                                FORM_DATA: this.formData,
+                                PREVIOUS_FORM_DATA: this.previousFormData,
+                                ALL_FORMS_DATA: this.allFormsData
+                            }, this.takeAction.bind(this));
+                            return [4 /*yield*/, apis.setRequestBody()];
                         case 1:
                             field = _a.sent();
                             return [4 /*yield*/, apis.validateRequestBody()];
@@ -2456,7 +1989,7 @@
                             else {
                                 // Request Body Validation Failed
                                 // Highlight Error in UI to User to Retry After Sometime.
-                                // Take Actions based on Validation
+                                // Take Action based on Validation
                                 setTimeout(function () {
                                     field["api"]["status"]["value"] = EApiStatusType.FAILED;
                                     field["showLoader"] = false;
@@ -2478,37 +2011,43 @@
             });
         };
         KwikIDFormViewComponent.prototype.handleOnClickSaveForm = function (e) {
-            var e_10, _a, e_11, _b, e_12, _c;
+            var e_9, _a, e_10, _b, e_11, _c;
             var _this = this;
             var formData = this.formGroup.getRawValue();
             try {
                 for (var _d = __values(this.formFields), _e = _d.next(); !_e.done; _e = _d.next()) {
                     var field = _e.value;
-                    if (field.type !== EFieldType.TITLE) {
+                    if (field.isFormElement) {
                         if (field.hidden) {
                             delete formData[field.key];
                         }
                         else {
-                            formData[field.key] = convertValueFromKwikUIFormatToBasicFormat(field, formData[field.key]);
+                            formData[field.key] = convertFormFieldValueToStandardFormat(field, formData[field.key]);
                         }
                     }
                 }
             }
-            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            catch (e_9_1) { e_9 = { error: e_9_1 }; }
             finally {
                 try {
                     if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                 }
-                finally { if (e_10) throw e_10.error; }
+                finally { if (e_9) throw e_9.error; }
             }
             var _loop_3 = function (field) {
-                if (field.type !== EFieldType.TITLE &&
+                if (field.isFormElement &&
                     field.validation.triggers.includes("ON_SAVE")) {
-                    var validations_3 = new Validations(field, this_3.formFields, formData, this_3.previousFormData, this_3.allFormsData, this_3.takeAction.bind(this_3));
+                    var validations_3 = new kwikidToolkit.Validation({
+                        FIELD_CONFIG: field,
+                        FORM_FIELDS: this_3.formFields,
+                        FORM_DATA: this_3.formData,
+                        PREVIOUS_FORM_DATA: this_3.previousFormData,
+                        ALL_FORMS_DATA: this_3.allFormsData
+                    }, this_3.takeAction.bind(this_3));
                     (function () { return __awaiter(_this, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, validations_3.validateField()];
+                                case 0: return [4 /*yield*/, validations_3.validate(field.validation)];
                                 case 1:
                                     _a.sent();
                                     return [2 /*return*/];
@@ -2524,15 +2063,15 @@
                     _loop_3(field);
                 }
             }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
             finally {
                 try {
                     if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_10) throw e_10.error; }
             }
             if (this.formGroup.invalid) {
-                var controls = new Validations(undefined, this.formFields, formData, this.previousFormData, this.allFormsData, this.takeAction.bind(this)).findInvalidControlsRecursive(this.formGroup);
+                var controls = new FormValidation().getFormFieldsInvalidControls(this.formGroup);
                 var firstFieldWithError = "";
                 try {
                     for (var controls_1 = __values(controls), controls_1_1 = controls_1.next(); !controls_1_1.done; controls_1_1 = controls_1.next()) {
@@ -2540,15 +2079,15 @@
                         if (control.invalid && kwikidToolkit.isEmptyValue(firstFieldWithError)) {
                             firstFieldWithError = control.key;
                         }
-                        this.formFields = setFieldError(this.formFields, this.formGroup.controls[control.key].errors, control.key, control.invalid);
+                        this.formFields = showFormFieldError(this.formFields, this.formGroup.controls[control.key].errors, control.key, control.invalid);
                     }
                 }
-                catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                catch (e_11_1) { e_11 = { error: e_11_1 }; }
                 finally {
                     try {
                         if (controls_1_1 && !controls_1_1.done && (_c = controls_1.return)) _c.call(controls_1);
                     }
-                    finally { if (e_12) throw e_12.error; }
+                    finally { if (e_11) throw e_11.error; }
                 }
                 this.toggleErrorNotification(true);
                 setTimeout(function () {
@@ -2568,7 +2107,7 @@
         };
         // Component Helpers
         KwikIDFormViewComponent.prototype.fieldHide = function (fieldKey) {
-            var field = findFieldFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
             var fieldIndex = this.formFields.findIndex(function (_) {
                 return field.key === _.key;
             });
@@ -2576,23 +2115,23 @@
             this.formGroup.updateValueAndValidity();
         };
         KwikIDFormViewComponent.prototype.fieldGroupHide = function (fieldGroup) {
-            var e_13, _a;
+            var e_12, _a;
             try {
                 for (var _b = __values(this.fieldGroups[fieldGroup]), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var fieldKey = _c.value;
                     this.fieldHide(fieldKey);
                 }
             }
-            catch (e_13_1) { e_13 = { error: e_13_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_13) throw e_13.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         };
         KwikIDFormViewComponent.prototype.fieldShow = function (fieldKey) {
-            var field = findFieldFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
             var fieldIndex = this.formFields.findIndex(function (_) {
                 return field.key === _.key;
             });
@@ -2600,27 +2139,27 @@
             this.formGroup.updateValueAndValidity();
         };
         KwikIDFormViewComponent.prototype.fieldGroupShow = function (fieldGroup) {
-            var e_14, _a;
+            var e_13, _a;
             try {
                 for (var _b = __values(this.fieldGroups[fieldGroup]), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var fieldKey = _c.value;
                     this.fieldShow(fieldKey);
                 }
             }
-            catch (e_14_1) { e_14 = { error: e_14_1 }; }
+            catch (e_13_1) { e_13 = { error: e_13_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_14) throw e_14.error; }
+                finally { if (e_13) throw e_13.error; }
             }
         };
         KwikIDFormViewComponent.prototype.fieldDisable = function (fieldKey) {
-            var field = findFieldFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
             var fieldIndex = this.formFields.findIndex(function (_) {
                 return field.key === _.key;
             });
-            if (field.type !== EFieldType.TITLE) {
+            if (field.isFormElement) {
                 this.formFields[fieldIndex]["disabled"] = true;
                 if (kwikidToolkit.isNotEmptyValue(this.formGroup.controls)) {
                     this.formGroup.controls[field.key].disable({
@@ -2631,27 +2170,27 @@
             }
         };
         KwikIDFormViewComponent.prototype.fieldGroupDisable = function (fieldGroup) {
-            var e_15, _a;
+            var e_14, _a;
             try {
                 for (var _b = __values(this.fieldGroups[fieldGroup]), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var fieldKey = _c.value;
                     this.fieldDisable(fieldKey);
                 }
             }
-            catch (e_15_1) { e_15 = { error: e_15_1 }; }
+            catch (e_14_1) { e_14 = { error: e_14_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_15) throw e_15.error; }
+                finally { if (e_14) throw e_14.error; }
             }
         };
         KwikIDFormViewComponent.prototype.fieldEnable = function (fieldKey) {
-            var field = findFieldFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
             var fieldIndex = this.formFields.findIndex(function (_) {
                 return field.key === _.key;
             });
-            if (field.type !== EFieldType.TITLE) {
+            if (field.isFormElement) {
                 this.formFields[fieldIndex]["disabled"] = false;
                 if (kwikidToolkit.isNotEmptyValue(this.formGroup.controls)) {
                     this.formGroup.controls[field.key].enable({
@@ -2662,37 +2201,37 @@
             }
         };
         KwikIDFormViewComponent.prototype.fieldGroupEnable = function (fieldGroup) {
-            var e_16, _a;
+            var e_15, _a;
             try {
                 for (var _b = __values(this.fieldGroups[fieldGroup]), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var fieldKey = _c.value;
                     this.fieldEnable(fieldKey);
                 }
             }
-            catch (e_16_1) { e_16 = { error: e_16_1 }; }
+            catch (e_15_1) { e_15 = { error: e_15_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_16) throw e_16.error; }
+                finally { if (e_15) throw e_15.error; }
             }
         };
         KwikIDFormViewComponent.prototype.fieldReset = function (fieldKey) {
             // Find the field and its index in the formFields array
-            var field = findFieldFromKey(this.formFields, fieldKey);
-            var fieldIndex = findFieldIndexFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
+            var fieldIndex = getFormFieldIndexByKey(this.formFields, fieldKey);
             // Delete the field from the formData object
             delete this.formData[fieldKey];
             // Reset the value of the field in the formGroup
-            this.formGroup.controls[field.key].reset(setEmptyValue(field), {
+            this.formGroup.controls[field.key].reset(convertFormFieldEmptyValueToKwikUIFormat(field), {
                 emitEvent: false
             });
             // Reset the messages and errors for the field
-            field = removeMessage(field, {
+            field = removeFormFieldMessage(field, {
                 type: EMessageType.WARNING,
                 message: ""
             });
-            field = removeMessage(field, {
+            field = removeFormFieldMessage(field, {
                 type: EMessageType.SUCCESS,
                 message: ""
             });
@@ -2715,37 +2254,37 @@
             }
         };
         KwikIDFormViewComponent.prototype.fieldErrorShow = function (fieldKey, message) {
-            var field = findFieldFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
             var fieldIndex = this.formFields.findIndex(function (_) {
                 return field.key === _.key;
             });
-            field = highlightFieldError(field, true);
-            field = addMessage(field, message);
+            field = highlightFormFieldError(field, true);
+            field = appendFormFieldMessage(field, message);
             this.formFields[fieldIndex] = field;
         };
         KwikIDFormViewComponent.prototype.fieldErrorHide = function (fieldKey, message) {
-            var field = findFieldFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
             var fieldIndex = this.formFields.findIndex(function (_) {
                 return field.key === _.key;
             });
-            field = highlightFieldError(field, false);
-            field = removeMessage(field, message);
+            field = highlightFormFieldError(field, false);
+            field = removeFormFieldMessage(field, message);
             this.formFields[fieldIndex] = field;
         };
         KwikIDFormViewComponent.prototype.fieldMessageShow = function (fieldKey, message) {
-            var field = findFieldFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
             var fieldIndex = this.formFields.findIndex(function (_) {
                 return field.key === _.key;
             });
-            field = addMessage(field, message);
+            field = appendFormFieldMessage(field, message);
             this.formFields[fieldIndex] = field;
         };
         KwikIDFormViewComponent.prototype.fieldMessageHide = function (fieldKey, message) {
-            var field = findFieldFromKey(this.formFields, fieldKey);
+            var field = getFormFieldByKey(this.formFields, fieldKey);
             var fieldIndex = this.formFields.findIndex(function (_) {
                 return field.key === _.key;
             });
-            field = removeMessage(field, message);
+            field = removeFormFieldMessage(field, message);
             this.formFields[fieldIndex] = field;
         };
         KwikIDFormViewComponent.prototype.setObjectValue = function (field, path, value) { };
@@ -2772,7 +2311,7 @@
         KwikIDFormViewComponent.prototype.getFormGroupRawValues = function () {
             return this.formGroup.getRawValue();
         };
-        KwikIDFormViewComponent.prototype.takeActionOnFieldGroup = function (action, field, allFormsData, formData, previousFormData) {
+        KwikIDFormViewComponent.prototype.takeActionOnFieldGroup = function (action, object) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (action.key) {
@@ -2846,7 +2385,7 @@
                             this.fieldMessageHide(action.props.fieldKey, action.props.message);
                             return [3 /*break*/, 20];
                         case 10:
-                            setValue_Sources = new kwikidToolkit.Sources(object);
+                            setValue_Sources = new kwikidToolkit.Source(object);
                             return [4 /*yield*/, setValue_Sources.getValueFromSource(action.props.value.source)];
                         case 11:
                             sourceValue = _b.sent();
@@ -2858,7 +2397,7 @@
                             this.previousFormData = setValue_Sources.object.PREVIOUS_FORM_DATA;
                             return [3 /*break*/, 20];
                         case 12:
-                            setDropdownValue_Sources = new kwikidToolkit.Sources(object);
+                            setDropdownValue_Sources = new kwikidToolkit.Source(object);
                             return [4 /*yield*/, setDropdownValue_Sources.getValueFromSource(action.props.value.source)];
                         case 13:
                             dropdownValue = _b.sent();
@@ -2885,7 +2424,7 @@
                                 setDropdownValue_Sources.object.PREVIOUS_FORM_DATA;
                             return [3 /*break*/, 20];
                         case 17:
-                            this.handleConnectedElements({ key: action.props.fieldKey }, "ACTION");
+                            this.handleConnectedElements({ key: action.props.fieldKey }, "ON_ACTION");
                             return [3 /*break*/, 20];
                         case 18: return [3 /*break*/, 20];
                         case 19: return [3 /*break*/, 20];
@@ -3225,14 +2764,14 @@
                 var formatFieldTypeDate = function (field) {
                     field = _this.setFieldKeyValue(field, "isFormElement", true);
                     if (kwikidToolkit.checkObjectKeyExists(field, "min")) {
-                        var tuiDay = convertDateStringToTuiDayFormat(field["min"]);
+                        var tuiDay = convertFormFieldTypeDateToKwikUIFormat(field["min"]);
                         field.properties = _this.setFieldKeyValue(field.properties, "min", tuiDay);
                     }
                     else {
                         field.properties = _this.setMissingFieldKeyValue(field.properties, "min", new cdk.TuiDay(0, 0, 1)); // Year - 0000, Month - 0 (0 Indexing), Day - 1
                     }
                     if (kwikidToolkit.checkObjectKeyExists(field, "max")) {
-                        var tuiDay = convertDateStringToTuiDayFormat(field["max"]);
+                        var tuiDay = convertFormFieldTypeDateToKwikUIFormat(field["max"]);
                         field.properties = _this.setFieldKeyValue(field.properties, "max", tuiDay);
                     }
                     else {
@@ -3869,9 +3408,8 @@
                 for (var formsList_1 = __values(formsList), formsList_1_1 = formsList_1.next(); !formsList_1_1.done; formsList_1_1 = formsList_1.next()) {
                     var form = formsList_1_1.value;
                     if (formsListCompleted.includes(form.key)) {
-                        console.log(formsListCompleted.includes(form.key));
-                        form = setValueToObject(form, "status", "completed");
-                        form = setValueToObject(form, "disabled", false);
+                        form = kwikidToolkit.setValueToObjectPath(form, "status", "completed");
+                        form = kwikidToolkit.setValueToObjectPath(form, "disabled", false);
                     }
                 }
             }
@@ -3893,18 +3431,18 @@
                         if (kwikidToolkit.checkObjectKeyExists(form, "dependentOn")) {
                             var isDependent = form.dependentOn.every(function (r) { return formsListCompleted.includes(r); });
                             if (isDependent) {
-                                form = setValueToObject(form, "status", "editable");
-                                form = setValueToObject(form, "disabled", false);
+                                form = kwikidToolkit.setValueToObjectPath(form, "status", "editable");
+                                form = kwikidToolkit.setValueToObjectPath(form, "disabled", false);
                             }
                             else {
-                                form = setValueToObject(form, "status", "locked");
-                                form = setValueToObject(form, "disabled", true);
+                                form = kwikidToolkit.setValueToObjectPath(form, "status", "locked");
+                                form = kwikidToolkit.setValueToObjectPath(form, "disabled", true);
                             }
                         }
                         else {
-                            form = setValueToObject(form, "dependentOn", []);
-                            form = setValueToObject(form, "status", "editable");
-                            form = setValueToObject(form, "disabled", false);
+                            form = kwikidToolkit.setValueToObjectPath(form, "dependentOn", []);
+                            form = kwikidToolkit.setValueToObjectPath(form, "status", "editable");
+                            form = kwikidToolkit.setValueToObjectPath(form, "disabled", false);
                         }
                     }
                 }
@@ -3968,7 +3506,6 @@
              * this particular User Form only has to LOCAL METHOD Variable.
              */
             var currentUserFormAllFormsData = this.filterAllFormsData(this.allFormsData, formsList);
-            console.log(JSON.parse(JSON.stringify(formsList)));
             formsListCompleted = this.findCompletedFormsList(currentUserFormAllFormsData);
             formsList = this.markFormInFormsListAsCompleted(formsList, formsListCompleted);
             formsList = this.markFormInFormsListAsDisabled(formsList, formsListCompleted);
@@ -4135,6 +3672,9 @@
         };
         KwikIDFormsRendererComponent.prototype.handleResize = function (formsList) {
             if (this.hostElement.nativeElement.offsetWidth < 600) {
+                var isSingleForm = function (formsList) {
+                    return formsList.length === 1;
+                };
                 if (!isSingleForm(formsList)) {
                     this.showFormSections = true;
                     this.showFormFields = false;
@@ -4191,9 +3731,8 @@
         // forms-list listener
         KwikIDFormsRendererComponent.prototype.handleOnClickSubmitForms = function (e) {
             var _this = this;
-            console.log(e);
             if (this.userConfig.userFormFieldsConfig.validation) {
-                var validations_1 = new kwikidToolkit.Validations({
+                var validations_1 = new kwikidToolkit.Validation({
                     USER_CONFIG: this.userConfig,
                     ALL_FORMS_DATA: this.formsData
                 }, this.takeAction.bind(this));
@@ -4262,7 +3801,7 @@
                             }
                             return [3 /*break*/, 3];
                         case 1:
-                            sources = new kwikidToolkit.Sources({
+                            sources = new kwikidToolkit.Source({
                                 USER_CONFIG: this.userConfig,
                                 ALL_FORMS_DATA: this.formsData
                             });