@messaia/cdk 13.3.4 → 13.3.5-rc01

package/esm2020/lib/forms/functions/decorators.mjs

@@ -2,7 +2,7 @@ import { headerMetadataKey } from "../../common/constants/constants";
 import { formFieldGroupMetadataKey } from "../constants/constants";
 import { FormFieldType } from "../enums/form-field-type";
 import { FormFieldDefinition } from "../models/form-field-definition";
-import { FormFieldGroup } from "../models/form-field-group";
+import { FormFieldGroupDefinition } from "../models/form-field-group-definition";
 import { getFormGroups } from "./functions";
 /**
  * Property decorator to create form fields
@@ -70,7 +70,7 @@ export function FormFieldOld(args) {
         }
         /* Create a new group */
         else {
-            group = new FormFieldGroup({ name: formField.groupName || null, header: formField.groupHeader, fields: [formField] });
+            group = new FormFieldGroupDefinition({ name: formField.groupName || null, header: formField.groupHeader, fields: [formField] });
             formFieldGroups.push(group);
         }
         /* Sort the fields by row */
@@ -151,41 +151,31 @@ export function FormField(args) {
 }
 /**
  * Property decorator to create form fields
- * @param args
+ * @param type
+ * @param header
+ * @param init
  * @returns
  */
-export function FormGroup(type, header, name) {
+export function FormFieldGroup(type, header, init) {
     return function (target, propertyKey) {
-        /* Set proprety name as group name, if empty */
-        name || (name = propertyKey);
+        /* Create an instance of the group object */
+        var instance = Reflect.construct(type, []);
         /* Get from groups */
-        var groups = getFormGroups(Reflect.construct(type, []));
-        /* Get all fields */
-        var fields = groups.map(x => x.fields).reduce((a, b) => a.concat(b), []) || [];
-        /* Get existing table groups */
-        let formFieldGroups = Reflect.getMetadata(formFieldGroupMetadataKey, target) || [];
-        /* Get the group */
-        var group = formFieldGroups.filter(x => x.name?.trim() == name?.trim())[0];
-        /* The group already exist, add the fields to it */
-        if (group) {
-            fields.forEach(x => x.groupName = name);
-            group.fields.push(...fields);
-        }
-        /* Create the new group */
-        else {
-            group = new FormFieldGroup({ name: name, header: header, fields: fields });
-            formFieldGroups.push(group);
-        }
-        /* Sort the fields by row */
-        group.fields = group?.fields?.sort((a, b) => (a.row || 0 > b.row || 0) ? 1 : ((b.row || 0 > a.row || 0) ? -1 : 0)) || [];
-        /* Group the fields */
-        group.groups = Object.values((group.fields).reduce(function (r, a) {
-            r[a.row] = r[a.row] || [];
-            r[a.row].push(a);
-            return r;
-        }, Object.create(null)));
-        /* Add new table column */
-        Reflect.defineMetadata(formFieldGroupMetadataKey, formFieldGroups, target);
+        var groups = getFormGroups(instance);
+        /* Get old form fields */
+        const previousFormFields = Reflect.getMetadata(formFieldGroupMetadataKey, target);
+        /* Get the fields from the groups */
+        groups?.map(x => x.fields)?.forEach(x => {
+            /* Set the name of the group in the fields */
+            x.forEach(y => {
+                y.groupName = propertyKey;
+                y.groupHeader = header;
+                y.groupObjectType = type;
+                y.groupObjectInstance = init || instance;
+            });
+            /* Create a copy of the result and override the result in the metadata */
+            Reflect.defineMetadata(formFieldGroupMetadataKey, (previousFormFields ? previousFormFields.concat(x) : x), target);
+        });
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../../../../projects/cdk/src/lib/forms/functions/decorators.ts"],"names":[],"mappings":"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","sourcesContent":["import { Type } from \"@angular/core\";\r\nimport { headerMetadataKey } from \"../../common/constants/constants\";\r\nimport { formFieldGroupMetadataKey } from \"../constants/constants\";\r\nimport { FormFieldType } from \"../enums/form-field-type\";\r\nimport { FormFieldDefinition } from \"../models/form-field-definition\";\r\nimport { FormFieldGroup } from \"../models/form-field-group\";\r\nimport { getFormGroups } from \"./functions\";\r\n\r\n/**\r\n * Property decorator to create form fields\r\n * @param args \r\n * @returns \r\n */\r\nexport function FormFieldOld(args: Partial<FormFieldDefinition>): Function {\r\n    return function (target: any, propertyKey: string) {\r\n        /* Get property name */\r\n        var propertyName = args.name || propertyKey;\r\n\r\n        /* Get property type */\r\n        var propertyType: string = Reflect.getMetadata(\"design:type\", target, propertyKey)?.name;\r\n\r\n        /* Create table column */\r\n        var formField = new FormFieldDefinition(Object.assign(args, <FormFieldDefinition>{\r\n            name: args.name || propertyKey,\r\n            header: args.header || Reflect.getMetadata(headerMetadataKey, target, propertyKey) || propertyName,\r\n            autocompleteTemplate: args.autocompleteTemplate || ((option: any) => option[formField.autocompleteText]),\r\n            chipTemplate: args.chipTemplate || ((chip: any) => chip[formField.chipText])\r\n        }));\r\n\r\n        /* Type enum */\r\n        if (formField.enumType) {\r\n            formField.type ||= FormFieldType.Enum;\r\n        }\r\n\r\n        /* Type VdSelect */\r\n        else if (formField.endpoint) {\r\n            formField.type ||= FormFieldType.VdSelect;\r\n        }\r\n\r\n        /* Type Select */\r\n        else if (formField.options) {\r\n            formField.type ||= FormFieldType.Select;\r\n        }\r\n\r\n        /* Type TextArea */\r\n        else if (formField.rows) {\r\n            formField.type ||= FormFieldType.TextArea;\r\n        }\r\n\r\n        /* Type File */\r\n        else if (formField.filePath) {\r\n            formField.type ||= FormFieldType.File;\r\n        }\r\n\r\n        /* Other types */\r\n        else {\r\n            switch (propertyType.toLowerCase()) {\r\n                case 'number':\r\n                    formField.type ||= FormFieldType.Text;\r\n                    formField.inputType ||= 'number';\r\n                    break;\r\n\r\n                case 'date':\r\n                    formField.type ||= FormFieldType.Date;\r\n                    break;\r\n\r\n                case 'boolean':\r\n                    formField.type ||= FormFieldType.Checkbox;\r\n                    break;\r\n\r\n                default:\r\n                    formField.type ||= FormFieldType.Text;\r\n                    break;\r\n            }\r\n        }\r\n\r\n        /* Get existing table groups */\r\n        let formFieldGroups: FormFieldGroup[] = Reflect.getMetadata(formFieldGroupMetadataKey, target) || [];\r\n\r\n        /* Get the group */\r\n        var group = formFieldGroups.filter(x => x.name?.trim() == formField.groupName?.trim())[0];\r\n\r\n        /* The group already exists, add the new form field */\r\n        if (group) {\r\n            group.fields.push(formField);\r\n        }\r\n\r\n        /* Create a new group */\r\n        else {\r\n            group = new FormFieldGroup({ name: formField.groupName || null, header: formField.groupHeader, fields: [formField] });\r\n            formFieldGroups.push(group);\r\n        }\r\n\r\n        /* Sort the fields by row */\r\n        group.fields = group.fields?.sort((a, b) => (a.row || 0 > b.row || 0) ? 1 : ((b.row || 0 > a.row || 0) ? -1 : 0)) || [];\r\n\r\n        /* Group the fields */\r\n        group.groups = Object.values((group.fields).reduce(function (r, a) {\r\n            r[a.row] = r[a.row] || [];\r\n            r[a.row].push(a);\r\n            return r;\r\n        }, Object.create(null))) as [FormFieldDefinition[]];\r\n\r\n        /* Add new table column */\r\n        Reflect.defineMetadata(formFieldGroupMetadataKey, formFieldGroups, target);\r\n    };\r\n}\r\n\r\n/**\r\n * Property decorator to create form fields\r\n * @param args \r\n * @returns \r\n */\r\nexport function FormField(args: Partial<FormFieldDefinition>): Function {\r\n    return function (target: any, propertyKey: string) {\r\n        /* Get property name */\r\n        var propertyName = args.name || propertyKey;\r\n\r\n        /* Get property type */\r\n        var propertyType: string = Reflect.getMetadata(\"design:type\", target, propertyKey)?.name;\r\n\r\n        /* Create table column */\r\n        var formField = new FormFieldDefinition(Object.assign(args, <FormFieldDefinition>{\r\n            name: args.name || propertyKey,\r\n            header: args.header || Reflect.getMetadata(headerMetadataKey, target, propertyKey) || propertyName,\r\n            autocompleteTemplate: args.autocompleteTemplate || ((option: any) => option[formField.autocompleteText]),\r\n            chipTemplate: args.chipTemplate || ((chip: any) => chip[formField.chipText])\r\n        }));\r\n\r\n        /* Type enum */\r\n        if (formField.enumType) {\r\n            formField.type ||= FormFieldType.Enum;\r\n        }\r\n\r\n        /* Type VdSelect */\r\n        else if (formField.endpoint) {\r\n            formField.type ||= FormFieldType.VdSelect;\r\n        }\r\n\r\n        /* Type Select */\r\n        else if (formField.options) {\r\n            formField.type ||= FormFieldType.Select;\r\n        }\r\n\r\n        /* Type TextArea */\r\n        else if (formField.rows) {\r\n            formField.type ||= FormFieldType.TextArea;\r\n        }\r\n\r\n        /* Type File */\r\n        else if (formField.filePath) {\r\n            formField.type ||= FormFieldType.File;\r\n        }\r\n\r\n        /* Other types */\r\n        else {\r\n            switch (propertyType.toLowerCase()) {\r\n                case 'number':\r\n                    formField.type ||= FormFieldType.Text;\r\n                    formField.inputType ||= 'number';\r\n                    break;\r\n\r\n                case 'date':\r\n                    formField.type ||= FormFieldType.Date;\r\n                    break;\r\n\r\n                case 'boolean':\r\n                    formField.type ||= FormFieldType.Checkbox;\r\n                    break;\r\n\r\n                default:\r\n                    formField.type ||= FormFieldType.Text;\r\n                    break;\r\n            }\r\n        }\r\n\r\n        /* Get old form fields */\r\n        const previousFormFields = Reflect.getMetadata(formFieldGroupMetadataKey, target);\r\n\r\n        /* Create a copy of the result */\r\n        let formFields = previousFormFields ? previousFormFields.concat([formField]) : [formField];\r\n\r\n        /* Override the result in the metadata */\r\n        Reflect.defineMetadata(formFieldGroupMetadataKey, formFields, target);\r\n    };\r\n}\r\n\r\n/**\r\n * Property decorator to create form fields\r\n * @param args \r\n * @returns \r\n */\r\nexport function FormGroup<T>(type: Type<T>, header: string, name?: string): Function {\r\n    return function (target: any, propertyKey: string) {\r\n        /* Set proprety name as group name, if empty */\r\n        name ||= propertyKey;\r\n\r\n        /* Get from groups */\r\n        var groups = getFormGroups(Reflect.construct(type, []));\r\n\r\n        /* Get all fields */\r\n        var fields = groups.map(x => x.fields).reduce((a, b) => a.concat(b), []) || [];\r\n\r\n        /* Get existing table groups */\r\n        let formFieldGroups: FormFieldGroup[] = Reflect.getMetadata(formFieldGroupMetadataKey, target) || [];\r\n\r\n        /* Get the group */\r\n        var group = formFieldGroups.filter(x => x.name?.trim() == name?.trim())[0];\r\n\r\n        /* The group already exist, add the fields to it */\r\n        if (group) {\r\n            fields.forEach(x => x.groupName = name);\r\n            group.fields.push(...fields);\r\n        }\r\n\r\n        /* Create the new group */\r\n        else {\r\n            group = new FormFieldGroup({ name: name, header: header, fields: fields });\r\n            formFieldGroups.push(group);\r\n        }\r\n\r\n        /* Sort the fields by row */\r\n        group.fields = group?.fields?.sort((a, b) => (a.row || 0 > b.row || 0) ? 1 : ((b.row || 0 > a.row || 0) ? -1 : 0)) || [];\r\n\r\n        /* Group the fields */\r\n        group.groups = Object.values((group.fields).reduce(function (r, a) {\r\n            r[a.row] = r[a.row] || [];\r\n            r[a.row].push(a);\r\n            return r;\r\n        }, Object.create(null))) as [FormFieldDefinition[]];\r\n\r\n        /* Add new table column */\r\n        Reflect.defineMetadata(formFieldGroupMetadataKey, formFieldGroups, target);\r\n    };\r\n}"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../../../../projects/cdk/src/lib/forms/functions/decorators.ts"],"names":[],"mappings":"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","sourcesContent":["import { Type } from \"@angular/core\";\r\nimport { headerMetadataKey } from \"../../common/constants/constants\";\r\nimport { formFieldGroupMetadataKey } from \"../constants/constants\";\r\nimport { FormFieldType } from \"../enums/form-field-type\";\r\nimport { FormFieldDefinition } from \"../models/form-field-definition\";\r\nimport { FormFieldGroupDefinition } from \"../models/form-field-group-definition\";\r\nimport { getFormGroups } from \"./functions\";\r\n\r\n/**\r\n * Property decorator to create form fields\r\n * @param args \r\n * @returns \r\n */\r\nexport function FormFieldOld(args: Partial<FormFieldDefinition>): Function {\r\n    return function (target: any, propertyKey: string) {\r\n        /* Get property name */\r\n        var propertyName = args.name || propertyKey;\r\n\r\n        /* Get property type */\r\n        var propertyType: string = Reflect.getMetadata(\"design:type\", target, propertyKey)?.name;\r\n\r\n        /* Create table column */\r\n        var formField = new FormFieldDefinition(Object.assign(args, <FormFieldDefinition>{\r\n            name: args.name || propertyKey,\r\n            header: args.header || Reflect.getMetadata(headerMetadataKey, target, propertyKey) || propertyName,\r\n            autocompleteTemplate: args.autocompleteTemplate || ((option: any) => option[formField.autocompleteText]),\r\n            chipTemplate: args.chipTemplate || ((chip: any) => chip[formField.chipText])\r\n        }));\r\n\r\n        /* Type enum */\r\n        if (formField.enumType) {\r\n            formField.type ||= FormFieldType.Enum;\r\n        }\r\n\r\n        /* Type VdSelect */\r\n        else if (formField.endpoint) {\r\n            formField.type ||= FormFieldType.VdSelect;\r\n        }\r\n\r\n        /* Type Select */\r\n        else if (formField.options) {\r\n            formField.type ||= FormFieldType.Select;\r\n        }\r\n\r\n        /* Type TextArea */\r\n        else if (formField.rows) {\r\n            formField.type ||= FormFieldType.TextArea;\r\n        }\r\n\r\n        /* Type File */\r\n        else if (formField.filePath) {\r\n            formField.type ||= FormFieldType.File;\r\n        }\r\n\r\n        /* Other types */\r\n        else {\r\n            switch (propertyType.toLowerCase()) {\r\n                case 'number':\r\n                    formField.type ||= FormFieldType.Text;\r\n                    formField.inputType ||= 'number';\r\n                    break;\r\n\r\n                case 'date':\r\n                    formField.type ||= FormFieldType.Date;\r\n                    break;\r\n\r\n                case 'boolean':\r\n                    formField.type ||= FormFieldType.Checkbox;\r\n                    break;\r\n\r\n                default:\r\n                    formField.type ||= FormFieldType.Text;\r\n                    break;\r\n            }\r\n        }\r\n\r\n        /* Get existing table groups */\r\n        let formFieldGroups: FormFieldGroupDefinition[] = Reflect.getMetadata(formFieldGroupMetadataKey, target) || [];\r\n\r\n        /* Get the group */\r\n        var group = formFieldGroups.filter(x => x.name?.trim() == formField.groupName?.trim())[0];\r\n\r\n        /* The group already exists, add the new form field */\r\n        if (group) {\r\n            group.fields.push(formField);\r\n        }\r\n\r\n        /* Create a new group */\r\n        else {\r\n            group = new FormFieldGroupDefinition({ name: formField.groupName || null, header: formField.groupHeader, fields: [formField] });\r\n            formFieldGroups.push(group);\r\n        }\r\n\r\n        /* Sort the fields by row */\r\n        group.fields = group.fields?.sort((a, b) => (a.row || 0 > b.row || 0) ? 1 : ((b.row || 0 > a.row || 0) ? -1 : 0)) || [];\r\n\r\n        /* Group the fields */\r\n        group.groups = Object.values((group.fields).reduce(function (r, a) {\r\n            r[a.row] = r[a.row] || [];\r\n            r[a.row].push(a);\r\n            return r;\r\n        }, Object.create(null))) as [FormFieldDefinition[]];\r\n\r\n        /* Add new table column */\r\n        Reflect.defineMetadata(formFieldGroupMetadataKey, formFieldGroups, target);\r\n    };\r\n}\r\n\r\n/**\r\n * Property decorator to create form fields\r\n * @param args \r\n * @returns \r\n */\r\nexport function FormField(args: Partial<FormFieldDefinition>): Function {\r\n    return function (target: any, propertyKey: string) {\r\n        /* Get property name */\r\n        var propertyName = args.name || propertyKey;\r\n\r\n        /* Get property type */\r\n        var propertyType: string = Reflect.getMetadata(\"design:type\", target, propertyKey)?.name;\r\n\r\n        /* Create table column */\r\n        var formField = new FormFieldDefinition(Object.assign(args, <FormFieldDefinition>{\r\n            name: args.name || propertyKey,\r\n            header: args.header || Reflect.getMetadata(headerMetadataKey, target, propertyKey) || propertyName,\r\n            autocompleteTemplate: args.autocompleteTemplate || ((option: any) => option[formField.autocompleteText]),\r\n            chipTemplate: args.chipTemplate || ((chip: any) => chip[formField.chipText])\r\n        }));\r\n\r\n        /* Type enum */\r\n        if (formField.enumType) {\r\n            formField.type ||= FormFieldType.Enum;\r\n        }\r\n\r\n        /* Type VdSelect */\r\n        else if (formField.endpoint) {\r\n            formField.type ||= FormFieldType.VdSelect;\r\n        }\r\n\r\n        /* Type Select */\r\n        else if (formField.options) {\r\n            formField.type ||= FormFieldType.Select;\r\n        }\r\n\r\n        /* Type TextArea */\r\n        else if (formField.rows) {\r\n            formField.type ||= FormFieldType.TextArea;\r\n        }\r\n\r\n        /* Type File */\r\n        else if (formField.filePath) {\r\n            formField.type ||= FormFieldType.File;\r\n        }\r\n\r\n        /* Other types */\r\n        else {\r\n            switch (propertyType.toLowerCase()) {\r\n                case 'number':\r\n                    formField.type ||= FormFieldType.Text;\r\n                    formField.inputType ||= 'number';\r\n                    break;\r\n\r\n                case 'date':\r\n                    formField.type ||= FormFieldType.Date;\r\n                    break;\r\n\r\n                case 'boolean':\r\n                    formField.type ||= FormFieldType.Checkbox;\r\n                    break;\r\n\r\n                default:\r\n                    formField.type ||= FormFieldType.Text;\r\n                    break;\r\n            }\r\n        }\r\n\r\n        /* Get old form fields */\r\n        const previousFormFields = Reflect.getMetadata(formFieldGroupMetadataKey, target);\r\n\r\n        /* Create a copy of the result */\r\n        let formFields = previousFormFields ? previousFormFields.concat([formField]) : [formField];\r\n\r\n        /* Override the result in the metadata */\r\n        Reflect.defineMetadata(formFieldGroupMetadataKey, formFields, target);\r\n    };\r\n}\r\n\r\n/**\r\n * Property decorator to create form fields\r\n * @param type \r\n * @param header \r\n * @param init \r\n * @returns \r\n */\r\nexport function FormFieldGroup<T>(type: Type<T>, header: string, init?: T): Function {\r\n    return function (target: any, propertyKey: string) {\r\n        /* Create an instance of the group object */\r\n        var instance = Reflect.construct(type, []);\r\n\r\n        /* Get from groups */\r\n        var groups = getFormGroups(instance);\r\n\r\n        /* Get old form fields */\r\n        const previousFormFields = Reflect.getMetadata(formFieldGroupMetadataKey, target);\r\n\r\n        /* Get the fields from the groups */\r\n        groups?.map(x => x.fields)?.forEach(x => {\r\n            /* Set the name of the group in the fields */\r\n            x.forEach(y => {\r\n                y.groupName = propertyKey;\r\n                y.groupHeader = header;\r\n                y.groupObjectType = type;\r\n                y.groupObjectInstance = init || instance\r\n            });\r\n\r\n            /* Create a copy of the result and override the result in the metadata */\r\n            Reflect.defineMetadata(formFieldGroupMetadataKey, (previousFormFields ? previousFormFields.concat(x) : x), target);\r\n        });\r\n    };\r\n}"]}

package/esm2020/lib/forms/functions/functions.mjs

@@ -1,6 +1,6 @@
 import { Utils } from "../../common/functions/utils";
 import { formFieldGroupMetadataKey } from "../constants/constants";
-import { FormFieldGroup } from "../models/form-field-group";
+import { FormFieldGroupDefinition } from "../models/form-field-group-definition";
 /**
  * Gets poperties decoarated with @FormField grouped by row
  * @param origin
@@ -17,17 +17,23 @@ export function getFormGroupsOld(origin) {
  */
 export function getFormGroups(origin) {
     const grouped = Utils.groupArrayBy(Reflect.getMetadata(formFieldGroupMetadataKey, origin), x => x.groupName);
-    return Array.from(grouped).map(([_, value]) => new FormFieldGroup({
+    return Array.from(grouped).map(([_, value]) => new FormFieldGroupDefinition({
         name: value[0].groupName || null,
         header: value[0].groupHeader,
         fields: value,
+        type: value[0].groupObjectType,
+        instance: value[0].groupObjectInstance,
         groups: Object.values((value).reduce(function (r, a) {
             r[a.row] = (r[a.row] || []);
             r[a.row].push(a);
-            r[a.row].forEach((x, i) => x.index = x.index || i);
+            r[a.row].forEach((x, i) => {
+                x.index = x.index || i;
+                delete x.groupObjectType;
+                delete x.groupObjectInstance;
+            });
             Utils.sortArray(r[a.row], 'index');
             return r;
         }, Object.create(null)))
     }));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2RrL3NyYy9saWIvZm9ybXMvZnVuY3Rpb25zL2Z1bmN0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTVEOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQixDQUFDLE1BQWM7SUFDM0MsT0FBTyxPQUFPLENBQUMsV0FBVyxDQUFDLHlCQUF5QixFQUFFLE1BQU0sQ0FBcUIsQ0FBQztBQUN0RixDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxhQUFhLENBQUMsTUFBYztJQUN4QyxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMseUJBQXlCLEVBQUUsTUFBTSxDQUEwQixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3RJLE9BQU8sS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxjQUFjLENBQUM7UUFDOUQsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLElBQUksSUFBSTtRQUNoQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVc7UUFDNUIsTUFBTSxFQUFFLEtBQUs7UUFDYixNQUFNLEVBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQTBCLEVBQUUsQ0FBc0I7WUFDOUYsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7WUFDNUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDbkQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1lBQ25DLE9BQU8sQ0FBQyxDQUFDO1FBQ2IsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBNkI7S0FDdkQsQ0FBQyxDQUFDLENBQUM7QUFDUixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVXRpbHMgfSBmcm9tIFwiLi4vLi4vY29tbW9uL2Z1bmN0aW9ucy91dGlsc1wiO1xyXG5pbXBvcnQgeyBmb3JtRmllbGRHcm91cE1ldGFkYXRhS2V5IH0gZnJvbSBcIi4uL2NvbnN0YW50cy9jb25zdGFudHNcIjtcclxuaW1wb3J0IHsgRm9ybUZpZWxkRGVmaW5pdGlvbiB9IGZyb20gXCIuLi9tb2RlbHMvZm9ybS1maWVsZC1kZWZpbml0aW9uXCI7XHJcbmltcG9ydCB7IEZvcm1GaWVsZEdyb3VwIH0gZnJvbSBcIi4uL21vZGVscy9mb3JtLWZpZWxkLWdyb3VwXCI7XHJcblxyXG4vKipcclxuICogR2V0cyBwb3BlcnRpZXMgZGVjb2FyYXRlZCB3aXRoIEBGb3JtRmllbGQgZ3JvdXBlZCBieSByb3dcclxuICogQHBhcmFtIG9yaWdpbiBcclxuICogQHJldHVybnMgXHJcbiAqIEBkZXByZWNhdGVkXHJcbiAqL1xyXG5leHBvcnQgZnVuY3Rpb24gZ2V0Rm9ybUdyb3Vwc09sZChvcmlnaW46IG9iamVjdCk6IEZvcm1GaWVsZEdyb3VwW10ge1xyXG4gICAgcmV0dXJuIFJlZmxlY3QuZ2V0TWV0YWRhdGEoZm9ybUZpZWxkR3JvdXBNZXRhZGF0YUtleSwgb3JpZ2luKSBhcyBGb3JtRmllbGRHcm91cFtdO1xyXG59XHJcblxyXG4vKipcclxuICogR2V0cyBwb3BlcnRpZXMgZGVjb2FyYXRlZCB3aXRoIEBGb3JtRmllbGQgZ3JvdXBlZCBieSByb3dcclxuICogQHBhcmFtIG9yaWdpbiBcclxuICogQHJldHVybnMgXHJcbiAqL1xyXG5leHBvcnQgZnVuY3Rpb24gZ2V0Rm9ybUdyb3VwcyhvcmlnaW46IG9iamVjdCk6IEZvcm1GaWVsZEdyb3VwW10ge1xyXG4gICAgY29uc3QgZ3JvdXBlZCA9IFV0aWxzLmdyb3VwQXJyYXlCeShSZWZsZWN0LmdldE1ldGFkYXRhKGZvcm1GaWVsZEdyb3VwTWV0YWRhdGFLZXksIG9yaWdpbikgYXMgRm9ybUZpZWxkRGVmaW5pdGlvbltdLCB4ID0+IHguZ3JvdXBOYW1lKTtcclxuICAgIHJldHVybiBBcnJheS5mcm9tKGdyb3VwZWQpLm1hcCgoW18sIHZhbHVlXSkgPT4gbmV3IEZvcm1GaWVsZEdyb3VwKHtcclxuICAgICAgICBuYW1lOiB2YWx1ZVswXS5ncm91cE5hbWUgfHwgbnVsbCxcclxuICAgICAgICBoZWFkZXI6IHZhbHVlWzBdLmdyb3VwSGVhZGVyLFxyXG4gICAgICAgIGZpZWxkczogdmFsdWUsXHJcbiAgICAgICAgZ3JvdXBzOiAoT2JqZWN0LnZhbHVlcygodmFsdWUpLnJlZHVjZShmdW5jdGlvbiAocjogW0Zvcm1GaWVsZERlZmluaXRpb25bXV0sIGE6IEZvcm1GaWVsZERlZmluaXRpb24pIHtcclxuICAgICAgICAgICAgclthLnJvd10gPSAoclthLnJvd10gfHwgW10pO1xyXG4gICAgICAgICAgICByW2Eucm93XS5wdXNoKGEpO1xyXG4gICAgICAgICAgICByW2Eucm93XS5mb3JFYWNoKCh4LCBpKSA9PiB4LmluZGV4ID0geC5pbmRleCB8fCBpKTtcclxuICAgICAgICAgICAgVXRpbHMuc29ydEFycmF5KHJbYS5yb3ddLCAnaW5kZXgnKTtcclxuICAgICAgICAgICAgcmV0dXJuIHI7XHJcbiAgICAgICAgfSwgT2JqZWN0LmNyZWF0ZShudWxsKSkpIGFzIFtGb3JtRmllbGREZWZpbml0aW9uW11dKVxyXG4gICAgfSkpO1xyXG59Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2RrL3NyYy9saWIvZm9ybXMvZnVuY3Rpb25zL2Z1bmN0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkUsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFFakY7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsTUFBYztJQUMzQyxPQUFPLE9BQU8sQ0FBQyxXQUFXLENBQUMseUJBQXlCLEVBQUUsTUFBTSxDQUErQixDQUFDO0FBQ2hHLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FBSSxNQUFjO0lBQzNDLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyx5QkFBeUIsRUFBRSxNQUFNLENBQTBCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDdEksT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLHdCQUF3QixDQUFDO1FBQ3hFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLElBQUk7UUFDaEMsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXO1FBQzVCLE1BQU0sRUFBRSxLQUFLO1FBQ2IsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxlQUFlO1FBQzlCLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsbUJBQW1CO1FBQ3RDLE1BQU0sRUFBRyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBMEIsRUFBRSxDQUFzQjtZQUM5RixDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUM1QixDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNqQixDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRTtnQkFDdEIsQ0FBQyxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsS0FBSyxJQUFJLENBQUMsQ0FBQztnQkFDdkIsT0FBTyxDQUFDLENBQUMsZUFBZSxDQUFDO2dCQUN6QixPQUFPLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQztZQUNqQyxDQUFDLENBQUMsQ0FBQztZQUNILEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztZQUNuQyxPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQTZCO0tBQ3ZELENBQUMsQ0FBQyxDQUFDO0FBQ1IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFV0aWxzIH0gZnJvbSBcIi4uLy4uL2NvbW1vbi9mdW5jdGlvbnMvdXRpbHNcIjtcclxuaW1wb3J0IHsgZm9ybUZpZWxkR3JvdXBNZXRhZGF0YUtleSB9IGZyb20gXCIuLi9jb25zdGFudHMvY29uc3RhbnRzXCI7XHJcbmltcG9ydCB7IEZvcm1GaWVsZERlZmluaXRpb24gfSBmcm9tIFwiLi4vbW9kZWxzL2Zvcm0tZmllbGQtZGVmaW5pdGlvblwiO1xyXG5pbXBvcnQgeyBGb3JtRmllbGRHcm91cERlZmluaXRpb24gfSBmcm9tIFwiLi4vbW9kZWxzL2Zvcm0tZmllbGQtZ3JvdXAtZGVmaW5pdGlvblwiO1xyXG5cclxuLyoqXHJcbiAqIEdldHMgcG9wZXJ0aWVzIGRlY29hcmF0ZWQgd2l0aCBARm9ybUZpZWxkIGdyb3VwZWQgYnkgcm93XHJcbiAqIEBwYXJhbSBvcmlnaW4gXHJcbiAqIEByZXR1cm5zIFxyXG4gKiBAZGVwcmVjYXRlZFxyXG4gKi9cclxuZXhwb3J0IGZ1bmN0aW9uIGdldEZvcm1Hcm91cHNPbGQob3JpZ2luOiBvYmplY3QpOiBGb3JtRmllbGRHcm91cERlZmluaXRpb25bXSB7XHJcbiAgICByZXR1cm4gUmVmbGVjdC5nZXRNZXRhZGF0YShmb3JtRmllbGRHcm91cE1ldGFkYXRhS2V5LCBvcmlnaW4pIGFzIEZvcm1GaWVsZEdyb3VwRGVmaW5pdGlvbltdO1xyXG59XHJcblxyXG4vKipcclxuICogR2V0cyBwb3BlcnRpZXMgZGVjb2FyYXRlZCB3aXRoIEBGb3JtRmllbGQgZ3JvdXBlZCBieSByb3dcclxuICogQHBhcmFtIG9yaWdpbiBcclxuICogQHJldHVybnMgXHJcbiAqL1xyXG5leHBvcnQgZnVuY3Rpb24gZ2V0Rm9ybUdyb3VwczxUPihvcmlnaW46IG9iamVjdCk6IEZvcm1GaWVsZEdyb3VwRGVmaW5pdGlvbltdIHtcclxuICAgIGNvbnN0IGdyb3VwZWQgPSBVdGlscy5ncm91cEFycmF5QnkoUmVmbGVjdC5nZXRNZXRhZGF0YShmb3JtRmllbGRHcm91cE1ldGFkYXRhS2V5LCBvcmlnaW4pIGFzIEZvcm1GaWVsZERlZmluaXRpb25bXSwgeCA9PiB4Lmdyb3VwTmFtZSk7XHJcbiAgICByZXR1cm4gQXJyYXkuZnJvbShncm91cGVkKS5tYXAoKFtfLCB2YWx1ZV0pID0+IG5ldyBGb3JtRmllbGRHcm91cERlZmluaXRpb24oe1xyXG4gICAgICAgIG5hbWU6IHZhbHVlWzBdLmdyb3VwTmFtZSB8fCBudWxsLFxyXG4gICAgICAgIGhlYWRlcjogdmFsdWVbMF0uZ3JvdXBIZWFkZXIsXHJcbiAgICAgICAgZmllbGRzOiB2YWx1ZSxcclxuICAgICAgICB0eXBlOiB2YWx1ZVswXS5ncm91cE9iamVjdFR5cGUsXHJcbiAgICAgICAgaW5zdGFuY2U6IHZhbHVlWzBdLmdyb3VwT2JqZWN0SW5zdGFuY2UsXHJcbiAgICAgICAgZ3JvdXBzOiAoT2JqZWN0LnZhbHVlcygodmFsdWUpLnJlZHVjZShmdW5jdGlvbiAocjogW0Zvcm1GaWVsZERlZmluaXRpb25bXV0sIGE6IEZvcm1GaWVsZERlZmluaXRpb24pIHtcclxuICAgICAgICAgICAgclthLnJvd10gPSAoclthLnJvd10gfHwgW10pO1xyXG4gICAgICAgICAgICByW2Eucm93XS5wdXNoKGEpO1xyXG4gICAgICAgICAgICByW2Eucm93XS5mb3JFYWNoKCh4LCBpKSA9PiB7XHJcbiAgICAgICAgICAgICAgICB4LmluZGV4ID0geC5pbmRleCB8fCBpO1xyXG4gICAgICAgICAgICAgICAgZGVsZXRlIHguZ3JvdXBPYmplY3RUeXBlO1xyXG4gICAgICAgICAgICAgICAgZGVsZXRlIHguZ3JvdXBPYmplY3RJbnN0YW5jZTtcclxuICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgICAgIFV0aWxzLnNvcnRBcnJheShyW2Eucm93XSwgJ2luZGV4Jyk7XHJcbiAgICAgICAgICAgIHJldHVybiByO1xyXG4gICAgICAgIH0sIE9iamVjdC5jcmVhdGUobnVsbCkpKSBhcyBbRm9ybUZpZWxkRGVmaW5pdGlvbltdXSlcclxuICAgIH0pKTtcclxufSJdfQ==

package/esm2020/lib/forms/models/form-field-definition.mjs

@@ -16,4 +16,4 @@ export class FormFieldDefinition {
         Object.assign(this, init);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS1maWVsZC1kZWZpbml0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2RrL3NyYy9saWIvZm9ybXMvbW9kZWxzL2Zvcm0tZmllbGQtZGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxNQUFNLE9BQU8sbUJBQW1CO0lBMkM1Qjs7O09BR0c7SUFDSCxZQUFtQixJQUFtQztRQTNDL0MsZ0JBQVcsR0FBWSxTQUFTLENBQUEsb0JBQW9CLENBQUM7UUFLckQsY0FBUyxHQUFZLE1BQU0sQ0FBQztRQUk1QixnQkFBVyxHQUFjLENBQUMsRUFBTyxFQUFFLEVBQU8sRUFBRSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUN6RCxnQkFBVyxHQUFZLFFBQVEsQ0FBQztRQUdoQyxhQUFRLEdBQWEsS0FBSyxDQUFDO1FBQzNCLGdCQUFXLEdBQVksSUFBSSxDQUFDO1FBQzVCLGVBQVUsR0FBWSxNQUFNLENBQUM7UUFRN0IsYUFBUSxHQUFZLE1BQU0sQ0FBQztRQUUzQixxQkFBZ0IsR0FBWSxNQUFNLENBQUM7UUFtQnRDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzlCLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFN1ZmZpeEJ1dHRvbiB9IGZyb20gXCIuLi8uLi9jb21tb24vbW9kZWxzL3N1ZmZpeC1idXR0b25cIjtcclxuaW1wb3J0IHsgRm9ybUZpZWxkVHlwZSB9IGZyb20gXCIuLi9lbnVtcy9mb3JtLWZpZWxkLXR5cGVcIjtcclxuXHJcbmV4cG9ydCBjbGFzcyBGb3JtRmllbGREZWZpbml0aW9uIHtcclxuICAgIHB1YmxpYyByb3c6IG51bWJlcjtcclxuICAgIHB1YmxpYyBpbmRleD86IG51bWJlcjtcclxuICAgIHB1YmxpYyBncm91cE5hbWU/OiBzdHJpbmc7XHJcbiAgICBwdWJsaWMgZ3JvdXBIZWFkZXI/OiBzdHJpbmcgPSAkbG9jYWxpemVgOkBAZGV0YWlsczpEZXRhaWxzYDtcclxuICAgIHB1YmxpYyBuYW1lPzogc3RyaW5nO1xyXG4gICAgcHVibGljIGhlYWRlcj86IHN0cmluZztcclxuICAgIHB1YmxpYyBoaW50Pzogc3RyaW5nO1xyXG4gICAgcHVibGljIHR5cGU/OiBGb3JtRmllbGRUeXBlO1xyXG4gICAgcHVibGljIGlucHV0VHlwZT86IHN0cmluZyA9ICd0ZXh0JztcclxuICAgIHB1YmxpYyBlbnVtVHlwZT86IGFueTtcclxuICAgIHB1YmxpYyBlbmRwb2ludD86IHN0cmluZztcclxuICAgIHB1YmxpYyBtYXBwZXI/OiBGdW5jdGlvbjtcclxuICAgIHB1YmxpYyBjb21wYXJlV2l0aD86IEZ1bmN0aW9uID0gKG8xOiBhbnksIG8yOiBhbnkpID0+IG8xID09PSBvMjtcclxuICAgIHB1YmxpYyBzZWFyY2hGaWVsZD86IHN0cmluZyA9ICdzZWFyY2gnO1xyXG4gICAgcHVibGljIHByb2plY3Rpb24/OiBzdHJpbmc7XHJcbiAgICBwdWJsaWMgcGFyYW1zPzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgbXVsdGlwbGU/OiBib29sZWFuID0gZmFsc2U7XHJcbiAgICBwdWJsaWMgb3B0aW9uVmFsdWU/OiBzdHJpbmcgPSAnaWQnO1xyXG4gICAgcHVibGljIG9wdGlvblRleHQ/OiBzdHJpbmcgPSAnbmFtZSc7XHJcbiAgICBwdWJsaWMgb3B0aW9uVGVtcGxhdGU/OiBGdW5jdGlvbjtcclxuICAgIHB1YmxpYyB0cmlnZ2VyVGVtcGxhdGU/OiBGdW5jdGlvbjtcclxuICAgIHB1YmxpYyBzZWxlY3Q/OiBGdW5jdGlvbjtcclxuICAgIHB1YmxpYyBpdGVtU2VsZWN0PzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgY2hhbmdlPzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgaXRlbUNoYW5nZT86IEZ1bmN0aW9uO1xyXG4gICAgcHVibGljIGNsZWFyPzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgY2hpcFRleHQ/OiBzdHJpbmcgPSAnbmFtZSc7XHJcbiAgICBwdWJsaWMgY2hpcFRlbXBsYXRlPzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgYXV0b2NvbXBsZXRlVGV4dD86IHN0cmluZyA9ICduYW1lJztcclxuICAgIHB1YmxpYyBhdXRvY29tcGxldGVUZW1wbGF0ZT86IEZ1bmN0aW9uO1xyXG4gICAgcHVibGljIG9wdGlvbnM/OiB7IGlkOiBhbnksIG5hbWU6IHN0cmluZyB9W107XHJcbiAgICBwdWJsaWMgZmlsZVBhdGg/OiBzdHJpbmc7XHJcbiAgICBwdWJsaWMgaXNQdWJsaWNGaWxlPzogYm9vbGVhbjtcclxuICAgIHB1YmxpYyBmaWxlRXh0ZW5zaW9ucz86IHN0cmluZ1tdO1xyXG4gICAgcHVibGljIGZsZXg/OiBudW1iZXI7XHJcbiAgICBwdWJsaWMgcm93cz86IG51bWJlcjtcclxuICAgIHB1YmxpYyBtaW5MZW5ndGg/OiBudW1iZXI7XHJcbiAgICBwdWJsaWMgbWF4TGVuZ3RoPzogbnVtYmVyO1xyXG4gICAgcHVibGljIHJlYWRvbmx5PzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgaGlkZT86IEZ1bmN0aW9uO1xyXG4gICAgcHVibGljIHN1ZmZpeEJ1dHRvbnM/OiBTdWZmaXhCdXR0b25bXTtcclxuXHJcbiAgICAvKipcclxuICAgICAqIGNvbnN0cnVjdG9yXHJcbiAgICAgKiBAcGFyYW0gaW5pdCBcclxuICAgICAqL1xyXG4gICAgcHVibGljIGNvbnN0cnVjdG9yKGluaXQ/OiBQYXJ0aWFsPEZvcm1GaWVsZERlZmluaXRpb24+KSB7XHJcbiAgICAgICAgT2JqZWN0LmFzc2lnbih0aGlzLCBpbml0KTtcclxuICAgIH1cclxufSJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS1maWVsZC1kZWZpbml0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2RrL3NyYy9saWIvZm9ybXMvbW9kZWxzL2Zvcm0tZmllbGQtZGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxNQUFNLE9BQU8sbUJBQW1CO0lBNkM1Qjs7O09BR0c7SUFDSCxZQUFtQixJQUFtQztRQTdDL0MsZ0JBQVcsR0FBWSxTQUFTLENBQUEsb0JBQW9CLENBQUM7UUFPckQsY0FBUyxHQUFZLE1BQU0sQ0FBQztRQUk1QixnQkFBVyxHQUFjLENBQUMsRUFBTyxFQUFFLEVBQU8sRUFBRSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUN6RCxnQkFBVyxHQUFZLFFBQVEsQ0FBQztRQUdoQyxhQUFRLEdBQWEsS0FBSyxDQUFDO1FBQzNCLGdCQUFXLEdBQVksSUFBSSxDQUFDO1FBQzVCLGVBQVUsR0FBWSxNQUFNLENBQUM7UUFRN0IsYUFBUSxHQUFZLE1BQU0sQ0FBQztRQUUzQixxQkFBZ0IsR0FBWSxNQUFNLENBQUM7UUFtQnRDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzlCLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFN1ZmZpeEJ1dHRvbiB9IGZyb20gXCIuLi8uLi9jb21tb24vbW9kZWxzL3N1ZmZpeC1idXR0b25cIjtcclxuaW1wb3J0IHsgRm9ybUZpZWxkVHlwZSB9IGZyb20gXCIuLi9lbnVtcy9mb3JtLWZpZWxkLXR5cGVcIjtcclxuXHJcbmV4cG9ydCBjbGFzcyBGb3JtRmllbGREZWZpbml0aW9uIHtcclxuICAgIHB1YmxpYyByb3c6IG51bWJlcjtcclxuICAgIHB1YmxpYyBpbmRleD86IG51bWJlcjtcclxuICAgIHB1YmxpYyBncm91cE5hbWU/OiBzdHJpbmc7XHJcbiAgICBwdWJsaWMgZ3JvdXBIZWFkZXI/OiBzdHJpbmcgPSAkbG9jYWxpemVgOkBAZGV0YWlsczpEZXRhaWxzYDtcclxuICAgIHB1YmxpYyBncm91cE9iamVjdFR5cGU/OiBhbnk7XHJcbiAgICBwdWJsaWMgZ3JvdXBPYmplY3RJbnN0YW5jZT86IG9iamVjdDtcclxuICAgIHB1YmxpYyBuYW1lPzogc3RyaW5nO1xyXG4gICAgcHVibGljIGhlYWRlcj86IHN0cmluZztcclxuICAgIHB1YmxpYyBoaW50Pzogc3RyaW5nO1xyXG4gICAgcHVibGljIHR5cGU/OiBGb3JtRmllbGRUeXBlO1xyXG4gICAgcHVibGljIGlucHV0VHlwZT86IHN0cmluZyA9ICd0ZXh0JztcclxuICAgIHB1YmxpYyBlbnVtVHlwZT86IGFueTtcclxuICAgIHB1YmxpYyBlbmRwb2ludD86IHN0cmluZztcclxuICAgIHB1YmxpYyBtYXBwZXI/OiBGdW5jdGlvbjtcclxuICAgIHB1YmxpYyBjb21wYXJlV2l0aD86IEZ1bmN0aW9uID0gKG8xOiBhbnksIG8yOiBhbnkpID0+IG8xID09PSBvMjtcclxuICAgIHB1YmxpYyBzZWFyY2hGaWVsZD86IHN0cmluZyA9ICdzZWFyY2gnO1xyXG4gICAgcHVibGljIHByb2plY3Rpb24/OiBzdHJpbmc7XHJcbiAgICBwdWJsaWMgcGFyYW1zPzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgbXVsdGlwbGU/OiBib29sZWFuID0gZmFsc2U7XHJcbiAgICBwdWJsaWMgb3B0aW9uVmFsdWU/OiBzdHJpbmcgPSAnaWQnO1xyXG4gICAgcHVibGljIG9wdGlvblRleHQ/OiBzdHJpbmcgPSAnbmFtZSc7XHJcbiAgICBwdWJsaWMgb3B0aW9uVGVtcGxhdGU/OiBGdW5jdGlvbjtcclxuICAgIHB1YmxpYyB0cmlnZ2VyVGVtcGxhdGU/OiBGdW5jdGlvbjtcclxuICAgIHB1YmxpYyBzZWxlY3Q/OiBGdW5jdGlvbjtcclxuICAgIHB1YmxpYyBpdGVtU2VsZWN0PzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgY2hhbmdlPzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgaXRlbUNoYW5nZT86IEZ1bmN0aW9uO1xyXG4gICAgcHVibGljIGNsZWFyPzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgY2hpcFRleHQ/OiBzdHJpbmcgPSAnbmFtZSc7XHJcbiAgICBwdWJsaWMgY2hpcFRlbXBsYXRlPzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgYXV0b2NvbXBsZXRlVGV4dD86IHN0cmluZyA9ICduYW1lJztcclxuICAgIHB1YmxpYyBhdXRvY29tcGxldGVUZW1wbGF0ZT86IEZ1bmN0aW9uO1xyXG4gICAgcHVibGljIG9wdGlvbnM/OiB7IGlkOiBhbnksIG5hbWU6IHN0cmluZyB9W107XHJcbiAgICBwdWJsaWMgZmlsZVBhdGg/OiBzdHJpbmc7XHJcbiAgICBwdWJsaWMgaXNQdWJsaWNGaWxlPzogYm9vbGVhbjtcclxuICAgIHB1YmxpYyBmaWxlRXh0ZW5zaW9ucz86IHN0cmluZ1tdO1xyXG4gICAgcHVibGljIGZsZXg/OiBudW1iZXI7XHJcbiAgICBwdWJsaWMgcm93cz86IG51bWJlcjtcclxuICAgIHB1YmxpYyBtaW5MZW5ndGg/OiBudW1iZXI7XHJcbiAgICBwdWJsaWMgbWF4TGVuZ3RoPzogbnVtYmVyO1xyXG4gICAgcHVibGljIHJlYWRvbmx5PzogRnVuY3Rpb247XHJcbiAgICBwdWJsaWMgaGlkZT86IEZ1bmN0aW9uO1xyXG4gICAgcHVibGljIHN1ZmZpeEJ1dHRvbnM/OiBTdWZmaXhCdXR0b25bXTtcclxuXHJcbiAgICAvKipcclxuICAgICAqIGNvbnN0cnVjdG9yXHJcbiAgICAgKiBAcGFyYW0gaW5pdCBcclxuICAgICAqL1xyXG4gICAgcHVibGljIGNvbnN0cnVjdG9yKGluaXQ/OiBQYXJ0aWFsPEZvcm1GaWVsZERlZmluaXRpb24+KSB7XHJcbiAgICAgICAgT2JqZWN0LmFzc2lnbih0aGlzLCBpbml0KTtcclxuICAgIH1cclxufSJdfQ==

package/esm2020/lib/forms/models/form-field-group-definition.mjs

@@ -0,0 +1,12 @@
+export class FormFieldGroupDefinition {
+    /**
+     * constructor
+     * @param init
+     */
+    constructor(init) {
+        this.name = 'details';
+        this.fields = [];
+        Object.assign(this, init);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS1maWVsZC1ncm91cC1kZWZpbml0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2RrL3NyYy9saWIvZm9ybXMvbW9kZWxzL2Zvcm0tZmllbGQtZ3JvdXAtZGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxNQUFNLE9BQU8sd0JBQXdCO0lBUWpDOzs7T0FHRztJQUNILFlBQW1CLElBQXdDO1FBWHBELFNBQUksR0FBVyxTQUFTLENBQUM7UUFFekIsV0FBTSxHQUEwQixFQUFFLENBQUM7UUFVdEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDOUIsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHlwZSB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCI7XHJcbmltcG9ydCB7IEZvcm1GaWVsZERlZmluaXRpb24gfSBmcm9tIFwiLi9mb3JtLWZpZWxkLWRlZmluaXRpb25cIjtcclxuXHJcbmV4cG9ydCBjbGFzcyBGb3JtRmllbGRHcm91cERlZmluaXRpb24ge1xyXG4gICAgcHVibGljIG5hbWU6IHN0cmluZyA9ICdkZXRhaWxzJztcclxuICAgIHB1YmxpYyBoZWFkZXI/OiBzdHJpbmc7XHJcbiAgICBwdWJsaWMgZmllbGRzOiBGb3JtRmllbGREZWZpbml0aW9uW10gPSBbXTtcclxuICAgIHB1YmxpYyBncm91cHM6IFtGb3JtRmllbGREZWZpbml0aW9uW11dO1xyXG4gICAgcHVibGljIHR5cGU/OiBUeXBlPGFueT47XHJcbiAgICBwdWJsaWMgaW5zdGFuY2U/OiBvYmplY3Q7XHJcblxyXG4gICAgLyoqXHJcbiAgICAgKiBjb25zdHJ1Y3RvclxyXG4gICAgICogQHBhcmFtIGluaXQgXHJcbiAgICAgKi9cclxuICAgIHB1YmxpYyBjb25zdHJ1Y3Rvcihpbml0PzogUGFydGlhbDxGb3JtRmllbGRHcm91cERlZmluaXRpb24+KSB7XHJcbiAgICAgICAgT2JqZWN0LmFzc2lnbih0aGlzLCBpbml0KTtcclxuICAgIH1cclxufSJdfQ==

package/fesm2015/messaia-cdk.mjs

@@ -5,7 +5,7 @@ import { HttpParams, HttpClient, HttpRequest, HttpHeaders, HttpEventType, HttpRe
 import * as i0 from '@angular/core';
 import { Directive, Input, Pipe, HostListener, Component, NgModule, Injectable, Injector, ViewEncapsulation, COMPILER_OPTIONS, CompilerFactory, Compiler, ContentChildren, Optional, SkipSelf, NgZone, ElementRef, ViewChildren, ViewChild, forwardRef, ContentChild, EventEmitter, ViewContainerRef, Output, LOCALE_ID, Inject, HostBinding, Self, Attribute, SecurityContext } from '@angular/core';
 import * as i1 from '@angular/forms';
-import { FormControlName, FormControlDirective, FormGroup as FormGroup$1, NG_VALUE_ACCESSOR, FormArray, FormControl, NG_ASYNC_VALIDATORS, NG_VALIDATORS, AbstractControl, FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormControlName, FormControlDirective, FormGroup, NG_VALUE_ACCESSOR, FormArray, FormControl, NG_ASYNC_VALIDATORS, NG_VALIDATORS, AbstractControl, FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import * as i1$2 from '@angular/material/dialog';
 import { MatDialogConfig, MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { MatExpansionPanel } from '@angular/material/expansion';
@@ -3136,7 +3136,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
 
 const formFieldGroupMetadataKey = Symbol('vdFormFieldGroup');
 
-class FormFieldGroup {
+class FormFieldGroupDefinition {
     /**
      * constructor
      * @param init
@@ -3164,14 +3164,20 @@ function getFormGroupsOld(origin) {
  */
 function getFormGroups(origin) {
     const grouped = Utils.groupArrayBy(Reflect.getMetadata(formFieldGroupMetadataKey, origin), x => x.groupName);
-    return Array.from(grouped).map(([_, value]) => new FormFieldGroup({
+    return Array.from(grouped).map(([_, value]) => new FormFieldGroupDefinition({
         name: value[0].groupName || null,
         header: value[0].groupHeader,
         fields: value,
+        type: value[0].groupObjectType,
+        instance: value[0].groupObjectInstance,
         groups: Object.values((value).reduce(function (r, a) {
             r[a.row] = (r[a.row] || []);
             r[a.row].push(a);
-            r[a.row].forEach((x, i) => x.index = x.index || i);
+            r[a.row].forEach((x, i) => {
+                x.index = x.index || i;
+                delete x.groupObjectType;
+                delete x.groupObjectInstance;
+            });
             Utils.sortArray(r[a.row], 'index');
             return r;
         }, Object.create(null)))
@@ -3478,12 +3484,14 @@ class GenericFormBaseComponent extends BaseComponent {
     validateForm(form = null) {
         var form = form || this.form;
         /* Set the form as submitted */
-        if (form && form instanceof FormGroup$1) {
+        if (form && form instanceof FormGroup) {
             /* Set form as submitted */
             form['submitted'] = true;
             /* Update value and validity */
             form.updateValueAndValidity();
         }
+        /* Print some debug information */
+        this.debugForm(form);
     }
     /**
      * Validates the form
@@ -3491,9 +3499,7 @@ class GenericFormBaseComponent extends BaseComponent {
      */
     isFormValid(form = null) {
         /* Print some debug information */
-        if (this.debug) {
-            this.debugForm(form);
-        }
+        this.debugForm(form);
         /* If the form ist not valid.. */
         if (!form.valid) {
             /* Mark invalid controls as dirtty and touched */
@@ -3568,15 +3574,17 @@ class GenericFormBaseComponent extends BaseComponent {
      * @param form
      */
     debugForm(form = null) {
-        console.log('Form:', form);
-        Object.keys(form.controls).forEach(key => {
-            const controlErrors = form.controls[key].errors;
-            if (controlErrors != null) {
-                Object.keys(controlErrors).forEach(keyError => {
-                    console.log('Key control: ' + key + ', keyError: ' + keyError + ', err value: ', controlErrors[keyError]);
-                });
-            }
-        });
+        if (this.debug) {
+            console.log('Form:', form);
+            Object.keys(form.controls).forEach(key => {
+                const controlErrors = form.controls[key].errors;
+                if (controlErrors != null) {
+                    Object.keys(controlErrors).forEach(keyError => {
+                        console.log('Key control: ' + key + ', keyError: ' + keyError + ', err value: ', controlErrors[keyError]);
+                    });
+                }
+            });
+        }
     }
     /**
      * Add toolbar menu items
@@ -7012,10 +7020,10 @@ function isResetControl(controlName, control, options) {
                     isReset = control instanceof FormControl;
                     break;
                 case ResetFormType.ControlsAndFormGroupsOnly:
-                    isReset = control instanceof FormControl || control instanceof FormGroup$1;
+                    isReset = control instanceof FormControl || control instanceof FormGroup;
                     break;
                 case ResetFormType.FormGroupsOnly:
-                    isReset = control instanceof FormGroup$1;
+                    isReset = control instanceof FormGroup;
                     break;
                 case ResetFormType.FormArraysOnly:
                     isReset = control instanceof FormArray;
@@ -7056,7 +7064,7 @@ function getNestedOptions(controlName, options) {
     return undefined;
 }
 
-class RxFormGroup extends FormGroup$1 {
+class RxFormGroup extends FormGroup {
     constructor(model, entityObject, controls, validatorOrOpts, asyncValidator) {
         super(controls, validatorOrOpts, asyncValidator);
         this.model = model;
@@ -7123,7 +7131,7 @@ class RxFormGroup extends FormGroup$1 {
         let isDirty = false;
         for (let name in this.value) {
             let currentValue = this.modelInstance[name];
-            if (!(this.controls[name] instanceof FormGroup$1 || this.controls[name] instanceof FormArray)) {
+            if (!(this.controls[name] instanceof FormGroup || this.controls[name] instanceof FormArray)) {
                 isDirty = ApplicationUtil.notEqualTo(this.baseObject[name], currentValue);
             }
             else if (this.controls[name] instanceof RxFormGroup)
@@ -7142,7 +7150,7 @@ class RxFormGroup extends FormGroup$1 {
     resetForm(options) {
         for (let name in this.controls) {
             if (isResetControl(name, this.controls[name], options)) {
-                if (this.controls[name] instanceof FormGroup$1)
+                if (this.controls[name] instanceof FormGroup)
                     this.controls[name].resetForm(getNestedOptions(name, options));
                 else if (this.controls[name] instanceof FormArray) {
                     this.controls[name].resetForm(options && options.value ? options.value[name] : undefined);
@@ -7158,7 +7166,7 @@ class RxFormGroup extends FormGroup$1 {
     }
     commit() {
         for (let name in this.controls) {
-            if (this.controls[name] instanceof FormGroup$1)
+            if (this.controls[name] instanceof FormGroup)
                 this.controls[name].commit();
             else if (this.controls[name] instanceof FormArray) {
                 this.controls[name].commit();
@@ -7189,7 +7197,7 @@ class RxFormGroup extends FormGroup$1 {
     getErrorSummary(onlyMessage) {
         let jObject = {};
         Object.keys(this.controls).forEach(columnName => {
-            if (this.controls[columnName] instanceof FormGroup$1) {
+            if (this.controls[columnName] instanceof FormGroup) {
                 let error = this.controls[columnName].getErrorSummary(false);
                 if (Object.keys(error).length > 0)
                     jObject[columnName] = error;
@@ -7222,7 +7230,7 @@ class RxFormGroup extends FormGroup$1 {
     }
     valueChangedSync() {
         Object.keys(this.controls).forEach(columnName => {
-            if (!(this.controls[columnName] instanceof FormArray || this.controls[columnName] instanceof RxFormArray) && !(this.controls[columnName] instanceof FormGroup$1 || this.controls[columnName] instanceof RxFormGroup) && !(this.entityObject[columnName] instanceof FormControl || this.entityObject[columnName] instanceof RxFormControl) && this.controls[columnName].getControlValue && ApplicationUtil.notEqualTo(this.controls[columnName].getControlValue(), this.entityObject[columnName])) {
+            if (!(this.controls[columnName] instanceof FormArray || this.controls[columnName] instanceof RxFormArray) && !(this.controls[columnName] instanceof FormGroup || this.controls[columnName] instanceof RxFormGroup) && !(this.entityObject[columnName] instanceof FormControl || this.entityObject[columnName] instanceof RxFormControl) && this.controls[columnName].getControlValue && ApplicationUtil.notEqualTo(this.controls[columnName].getControlValue(), this.entityObject[columnName])) {
                 this.controls[columnName].setValue(this.entityObject[columnName], { updateChanged: true });
             }
             else if ((this.controls[columnName] instanceof FormArray || this.controls[columnName] instanceof RxFormArray)) {
@@ -7237,7 +7245,7 @@ class RxFormGroup extends FormGroup$1 {
     }
     refreshDisable() {
         Object.keys(this.controls).forEach(columnName => {
-            if (!(this.controls[columnName] instanceof FormArray || this.controls[columnName] instanceof RxFormArray) && !(this.controls[columnName] instanceof FormGroup$1 || this.controls[columnName] instanceof RxFormGroup)) {
+            if (!(this.controls[columnName] instanceof FormArray || this.controls[columnName] instanceof RxFormArray) && !(this.controls[columnName] instanceof FormGroup || this.controls[columnName] instanceof RxFormGroup)) {
                 this.controls[columnName].refresh();
             }
             else if ((this.controls[columnName] instanceof RxFormGroup)) {
@@ -7247,7 +7255,7 @@ class RxFormGroup extends FormGroup$1 {
     }
     bindErrorMessages() {
         Object.keys(this.controls).forEach(columnName => {
-            if (!(this.controls[columnName] instanceof FormArray || this.controls[columnName] instanceof RxFormArray) && !(this.controls[columnName] instanceof FormGroup$1 || this.controls[columnName] instanceof RxFormGroup)) {
+            if (!(this.controls[columnName] instanceof FormArray || this.controls[columnName] instanceof RxFormArray) && !(this.controls[columnName] instanceof FormGroup || this.controls[columnName] instanceof RxFormGroup)) {
                 this.controls[columnName].bindError();
             }
             else if ((this.controls[columnName] instanceof RxFormGroup)) {
@@ -7266,7 +7274,7 @@ class RxFormGroup extends FormGroup$1 {
                 for (let formGroup of formArray.controls)
                     formGroup.submitted = value;
             }
-            else if (this.controls[columnName] instanceof FormGroup$1) {
+            else if (this.controls[columnName] instanceof FormGroup) {
                 this.controls[columnName].submitted = value;
             }
             else
@@ -7303,7 +7311,7 @@ class RxFormGroup extends FormGroup$1 {
     setBackEndErrors(errors) {
         Object.keys(errors).forEach(controlName => {
             if (this.controls[controlName]) {
-                if (this.controls[controlName] instanceof FormGroup$1)
+                if (this.controls[controlName] instanceof FormGroup)
                     this.controls[controlName].setBackEndErrors(errors[controlName]);
                 else
                     this.controls[controlName].setBackEndErrors(errors[controlName]);
@@ -7314,7 +7322,7 @@ class RxFormGroup extends FormGroup$1 {
         let clearErrors = errors ? Object.keys(errors) : Object.keys(this.controls);
         clearErrors.forEach(controlName => {
             if (this.controls[controlName]) {
-                if (this.controls[controlName] instanceof FormGroup$1)
+                if (this.controls[controlName] instanceof FormGroup)
                     errors ? this.controls[controlName].clearBackEndErrors(errors[controlName]) : this.controls[controlName].clearBackEndErrors();
                 else
                     errors ? this.controls[controlName].clearBackEndErrors(errors[controlName]) : this.controls[controlName].clearBackEndErrors();
@@ -9504,7 +9512,7 @@ class RxwebFormDirective extends BaseDirective {
     }
     updateValueAndValidity(controls) {
         Object.keys(controls).forEach(key => {
-            if (controls[key] instanceof FormGroup$1)
+            if (controls[key] instanceof FormGroup)
                 this.updateValueAndValidity(controls[key].controls);
             else if (controls[key] instanceof FormArray)
                 this.updateValueAndValidity(controls[key].controls);
@@ -9541,7 +9549,7 @@ class RxwebFormDirective extends BaseDirective {
                     }
                 });
             }
-            else if (formControl instanceof FormGroup$1) {
+            else if (formControl instanceof FormGroup) {
                 this.expressionProcessor(formControl.controls, `${fieldName}.`);
             }
             else if (formControl instanceof FormArray) {
@@ -9558,7 +9566,7 @@ class RxwebFormDirective extends BaseDirective {
             if (this.validationRule.conditionalValidationProps && this.validationRule.conditionalValidationProps[fieldName]) {
                 controls[fieldName][CONDITIONAL_VALIDATOR] = conditionalChangeValidator(this.validationRule.conditionalValidationProps[fieldName]);
             }
-            else if (controls[fieldName] instanceof FormGroup$1 && this.validationRule.conditionalObjectProps) {
+            else if (controls[fieldName] instanceof FormGroup && this.validationRule.conditionalObjectProps) {
                 var fields = this.validationRule.conditionalObjectProps.filter(t => t.objectPropName == fieldName);
                 let nestedFormGroup = controls[fieldName];
                 let propWiseConditionalControls = {};
@@ -11025,10 +11033,10 @@ class RxFormBuilder extends BaseFormBuilder {
             }
             else if (typeof prop == OBJECT_STRING && !(prop instanceof FormControl || prop instanceof RxFormControl)) {
                 let formGroup = (prop instanceof FormArray) ? prop.controls[0] : prop;
-                if (!formGroup.model && (prop instanceof FormGroup$1 || prop instanceof RxFormGroup)) {
+                if (!formGroup.model && (prop instanceof FormGroup || prop instanceof RxFormGroup)) {
                     formGroup = this.group(formGroup.controls);
                 }
-                if (prop instanceof FormGroup$1 || prop instanceof RxFormGroup) {
+                if (prop instanceof FormGroup || prop instanceof RxFormGroup) {
                     entityObject[propName] = prop;
                     defaultContainer.initPropertyObject(propName, OBJECT_PROPERTY, formGroup.model, modelInstance);
                 }
@@ -11169,7 +11177,7 @@ class RxFormBuilder extends BaseFormBuilder {
                         break;
                     case OBJECT_PROPERTY:
                         let objectValue = entityObject[property.name];
-                        if (objectValue && objectValue instanceof Object && !(objectValue instanceof FormGroup$1 || objectValue instanceof RxFormGroup)) {
+                        if (objectValue && objectValue instanceof Object && !(objectValue instanceof FormGroup || objectValue instanceof RxFormGroup)) {
                             this.isNestedBinding = this.isNested = true;
                             if (instanceContainer && instanceContainer.conditionalObjectProps)
                                 this.conditionalObjectProps = instanceContainer.conditionalObjectProps.filter(t => t.objectPropName == property.name);
@@ -11184,7 +11192,7 @@ class RxFormBuilder extends BaseFormBuilder {
                             this.builderConfigurationConditionalObjectProps = [];
                             this.isNestedBinding = this.isNested = false;
                         }
-                        else if (objectValue instanceof FormGroup$1 || objectValue instanceof RxFormGroup)
+                        else if (objectValue instanceof FormGroup || objectValue instanceof RxFormGroup)
                             formGroupObject[property.name] = objectValue;
                         break;
                     case ARRAY_PROPERTY:
@@ -14604,7 +14612,7 @@ function FormFieldOld(args) {
         }
         /* Create a new group */
         else {
-            group = new FormFieldGroup({ name: formField.groupName || null, header: formField.groupHeader, fields: [formField] });
+            group = new FormFieldGroupDefinition({ name: formField.groupName || null, header: formField.groupHeader, fields: [formField] });
             formFieldGroups.push(group);
         }
         /* Sort the fields by row */
@@ -14686,42 +14694,32 @@ function FormField(args) {
 }
 /**
  * Property decorator to create form fields
- * @param args
+ * @param type
+ * @param header
+ * @param init
  * @returns
  */
-function FormGroup(type, header, name) {
+function FormFieldGroup(type, header, init) {
     return function (target, propertyKey) {
         var _a;
-        /* Set proprety name as group name, if empty */
-        name || (name = propertyKey);
+        /* Create an instance of the group object */
+        var instance = Reflect.construct(type, []);
         /* Get from groups */
-        var groups = getFormGroups(Reflect.construct(type, []));
-        /* Get all fields */
-        var fields = groups.map(x => x.fields).reduce((a, b) => a.concat(b), []) || [];
-        /* Get existing table groups */
-        let formFieldGroups = Reflect.getMetadata(formFieldGroupMetadataKey, target) || [];
-        /* Get the group */
-        var group = formFieldGroups.filter(x => { var _a; return ((_a = x.name) === null || _a === void 0 ? void 0 : _a.trim()) == (name === null || name === void 0 ? void 0 : name.trim()); })[0];
-        /* The group already exist, add the fields to it */
-        if (group) {
-            fields.forEach(x => x.groupName = name);
-            group.fields.push(...fields);
-        }
-        /* Create the new group */
-        else {
-            group = new FormFieldGroup({ name: name, header: header, fields: fields });
-            formFieldGroups.push(group);
-        }
-        /* Sort the fields by row */
-        group.fields = ((_a = group === null || group === void 0 ? void 0 : group.fields) === null || _a === void 0 ? void 0 : _a.sort((a, b) => (a.row || 0 > b.row || 0) ? 1 : ((b.row || 0 > a.row || 0) ? -1 : 0))) || [];
-        /* Group the fields */
-        group.groups = Object.values((group.fields).reduce(function (r, a) {
-            r[a.row] = r[a.row] || [];
-            r[a.row].push(a);
-            return r;
-        }, Object.create(null)));
-        /* Add new table column */
-        Reflect.defineMetadata(formFieldGroupMetadataKey, formFieldGroups, target);
+        var groups = getFormGroups(instance);
+        /* Get old form fields */
+        const previousFormFields = Reflect.getMetadata(formFieldGroupMetadataKey, target);
+        /* Get the fields from the groups */
+        (_a = groups === null || groups === void 0 ? void 0 : groups.map(x => x.fields)) === null || _a === void 0 ? void 0 : _a.forEach(x => {
+            /* Set the name of the group in the fields */
+            x.forEach(y => {
+                y.groupName = propertyKey;
+                y.groupHeader = header;
+                y.groupObjectType = type;
+                y.groupObjectInstance = init || instance;
+            });
+            /* Create a copy of the result and override the result in the metadata */
+            Reflect.defineMetadata(formFieldGroupMetadataKey, (previousFormFields ? previousFormFields.concat(x) : x), target);
+        });
     };
 }
 
@@ -16954,5 +16952,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractMatFormField, ActionMenuItem, Api, AppSetting, AppStorage, AsyncValidationDirective, AuditEntity, AuditUser, AuthHelper, AuthUser, BaseComponent, BaseDirective, BaseEntity, BaseInterceptor, BaseService, CachingInterceptor, Column, Common, ContextHelper, DataSourceFilterDirective, DataSourcePipe, DisableControlDirective, Display, DynamicBuilder, DynamicComponentCompiler, EnumPipe, EnumService, EqualValidator, ErrorMessageBindingStrategy, FileControlDirective, FileService, FileSizePipe, FilterClearComponent, FilterDateComponent, FilterInputComponent, FilterPipe, FilterSelectComponent, FirstLetterPipe, FormBuilderConfiguration, FormField, FormFieldDefinition, FormFieldGroup, FormFieldType, FormGroup, GenericFormBaseComponent, GenericFormComponent, GenericListComponent, GenericReactiveFormComponent, GenericService, HtmlControlTemplateDirective, IAbstractControl, ImageFileControlDirective, IpVersion, KeyValue, KeysPipe, LoadingScreenInterceptor, LoadingScreenService, MatFormFieldEditorDirective, MatFormFieldReadonlyDirective, Menu, MenuItem, MenuItemService, MenuResolve, MenuScope, MenuService, MessageType, MonthNamePipe, NativeElementInjectorDirective, NumericValueType, OnlyNumberDirective, OrderPipe, Pagination, PlaceholderPipe, PrintService, RUNTIME_COMPILER_PROVIDERS, ReactiveFormConfig, ReactiveTypedFormsModule, ResetFormType, RxFormArray, RxFormBuilder, RxFormControl, RxFormControlDirective, RxFormGroup, RxReactiveFormsModule, RxwebFormDirective, RxwebValidators, SafeHtmlPipe, Salutation, SaveAction, ServiceLocator, SubMenuResolve, SuffixButton, Table, TableColumn, TableColumnType, TableDataSource, TableDefinition, TableMenuItem, TableStaticDataSource, TimePipe, TitleCase, TruncatePipe, TypedForm, TypedFormBuilder, UniqueValidatorDirective, Utils, ValidationAlphabetLocale, ValueAccessorBase, ValuesPipe, VdAlertDialogComponent, VdAutocompleteOptionDirective, VdBaseModule, VdChipDirective, VdChipsComponent, VdChipsModule, VdCodeDirective, VdCommonModule, VdConfirmDialogComponent, VdCustomDirective, VdDialogActionsDirective, VdDialogComponent, VdDialogContentDirective, VdDialogService, VdDialogTitleDirective, VdDialogsModule, VdDynamicTableComponent, VdEditorDirective, VdFileDirective, VdFileInputComponent, VdFileModule, VdFilterOptionDirective, VdFormToolbarComponent, VdFormToolbarMenuComponent, VdFormsModule, VdGenericFormComponent, VdHttpModule, VdLayoutCardOverComponent, VdLayoutCloseDirective, VdLayoutComponent, VdLayoutFooterComponent, VdLayoutManageListCloseDirective, VdLayoutManageListComponent, VdLayoutManageListOpenDirective, VdLayoutManageListToggleDirective, VdLayoutModule, VdLayoutNavComponent, VdLayoutNavListCloseDirective, VdLayoutNavListComponent, VdLayoutNavListOpenDirective, VdLayoutNavListToggleDirective, VdLayoutOpenDirective, VdLayoutToggleDirective, VdListToolbarComponent, VdListToolbarMenuComponent, VdMediaModule, VdMediaService, VdMediaToggleDirective, VdMenuComponent, VdMenuModule, VdNavigationDrawerComponent, VdNavigationDrawerMenuDirective, VdNavigationDrawerToolbarDirective, VdPromptDialogComponent, VdSearchBoxComponent, VdSearchInputComponent, VdSearchModule, VdSelectComponent, VdSelectModule, VdSelectOptionDirective, VdSelectTriggerDirective, VdTableModule, allOf, allOfAsync, alpha, alphaAsync, alphaNumeric, alphaNumericAsync, and, ascii, async, blacklist, choice, choiceAsync, compare, compose, contains, containsAsync, createCompiler, creditCard, creditCardAsync, cusip, custom, customAsync, dataUri, date, dateAsync, different, digit, disable, elementClass, email, endsWith, endsWithAsync, error, escape, even, extension, extensionAsync, factor, factorAsync, file, fileAsync, fileSize, fileSizeAsync, formFieldGroupMetadataKey, getEndpoint, getFormGroups, getTableDefinition, greaterThan, greaterThanAsync, greaterThanEqualTo, greaterThanEqualToAsync, grid, headerMetadataKey, hexColor, image, imageAsync, json, latLong, latitude, leapYear, lessThan, lessThanAsync, lessThanEqualTo, lessThanEqualToAsync, longitude, lowerCase, ltrim, mac, mask, maxDate, maxDateAsync, maxLength, maxLengthAsync, maxNumber, maxNumberAsync, maxTime, maxTimeAsync, minDate, minDateAsync, minLength, minLengthAsync, minNumber, minNumberAsync, minTime, minTimeAsync, mixinControlValueAccessor, mixinDisabled, model, noneOf, noneOfAsync, not, notEmpty, numeric, numericAsync, odd, oneOf, oneOfAsync, or, password, passwordAsync, pattern, patternAsync, port, prefix, primeNumber, prop, propArray, propObject, range, rangeAsync, required, requiredTrue, rtrim, rule, sanitize, startsWith, startsWithAsync, stripLow, suffix, time, timeAsync, toBoolean, toDate, toDouble, toFloat, toInt, toString, trim, unique, upperCase, url, urlAsync, whitelist };
+export { AbstractMatFormField, ActionMenuItem, Api, AppSetting, AppStorage, AsyncValidationDirective, AuditEntity, AuditUser, AuthHelper, AuthUser, BaseComponent, BaseDirective, BaseEntity, BaseInterceptor, BaseService, CachingInterceptor, Column, Common, ContextHelper, DataSourceFilterDirective, DataSourcePipe, DisableControlDirective, Display, DynamicBuilder, DynamicComponentCompiler, EnumPipe, EnumService, EqualValidator, ErrorMessageBindingStrategy, FileControlDirective, FileService, FileSizePipe, FilterClearComponent, FilterDateComponent, FilterInputComponent, FilterPipe, FilterSelectComponent, FirstLetterPipe, FormBuilderConfiguration, FormField, FormFieldDefinition, FormFieldGroup, FormFieldGroupDefinition, FormFieldType, GenericFormBaseComponent, GenericFormComponent, GenericListComponent, GenericReactiveFormComponent, GenericService, HtmlControlTemplateDirective, IAbstractControl, ImageFileControlDirective, IpVersion, KeyValue, KeysPipe, LoadingScreenInterceptor, LoadingScreenService, MatFormFieldEditorDirective, MatFormFieldReadonlyDirective, Menu, MenuItem, MenuItemService, MenuResolve, MenuScope, MenuService, MessageType, MonthNamePipe, NativeElementInjectorDirective, NumericValueType, OnlyNumberDirective, OrderPipe, Pagination, PlaceholderPipe, PrintService, RUNTIME_COMPILER_PROVIDERS, ReactiveFormConfig, ReactiveTypedFormsModule, ResetFormType, RxFormArray, RxFormBuilder, RxFormControl, RxFormControlDirective, RxFormGroup, RxReactiveFormsModule, RxwebFormDirective, RxwebValidators, SafeHtmlPipe, Salutation, SaveAction, ServiceLocator, SubMenuResolve, SuffixButton, Table, TableColumn, TableColumnType, TableDataSource, TableDefinition, TableMenuItem, TableStaticDataSource, TimePipe, TitleCase, TruncatePipe, TypedForm, TypedFormBuilder, UniqueValidatorDirective, Utils, ValidationAlphabetLocale, ValueAccessorBase, ValuesPipe, VdAlertDialogComponent, VdAutocompleteOptionDirective, VdBaseModule, VdChipDirective, VdChipsComponent, VdChipsModule, VdCodeDirective, VdCommonModule, VdConfirmDialogComponent, VdCustomDirective, VdDialogActionsDirective, VdDialogComponent, VdDialogContentDirective, VdDialogService, VdDialogTitleDirective, VdDialogsModule, VdDynamicTableComponent, VdEditorDirective, VdFileDirective, VdFileInputComponent, VdFileModule, VdFilterOptionDirective, VdFormToolbarComponent, VdFormToolbarMenuComponent, VdFormsModule, VdGenericFormComponent, VdHttpModule, VdLayoutCardOverComponent, VdLayoutCloseDirective, VdLayoutComponent, VdLayoutFooterComponent, VdLayoutManageListCloseDirective, VdLayoutManageListComponent, VdLayoutManageListOpenDirective, VdLayoutManageListToggleDirective, VdLayoutModule, VdLayoutNavComponent, VdLayoutNavListCloseDirective, VdLayoutNavListComponent, VdLayoutNavListOpenDirective, VdLayoutNavListToggleDirective, VdLayoutOpenDirective, VdLayoutToggleDirective, VdListToolbarComponent, VdListToolbarMenuComponent, VdMediaModule, VdMediaService, VdMediaToggleDirective, VdMenuComponent, VdMenuModule, VdNavigationDrawerComponent, VdNavigationDrawerMenuDirective, VdNavigationDrawerToolbarDirective, VdPromptDialogComponent, VdSearchBoxComponent, VdSearchInputComponent, VdSearchModule, VdSelectComponent, VdSelectModule, VdSelectOptionDirective, VdSelectTriggerDirective, VdTableModule, allOf, allOfAsync, alpha, alphaAsync, alphaNumeric, alphaNumericAsync, and, ascii, async, blacklist, choice, choiceAsync, compare, compose, contains, containsAsync, createCompiler, creditCard, creditCardAsync, cusip, custom, customAsync, dataUri, date, dateAsync, different, digit, disable, elementClass, email, endsWith, endsWithAsync, error, escape, even, extension, extensionAsync, factor, factorAsync, file, fileAsync, fileSize, fileSizeAsync, formFieldGroupMetadataKey, getEndpoint, getFormGroups, getTableDefinition, greaterThan, greaterThanAsync, greaterThanEqualTo, greaterThanEqualToAsync, grid, headerMetadataKey, hexColor, image, imageAsync, json, latLong, latitude, leapYear, lessThan, lessThanAsync, lessThanEqualTo, lessThanEqualToAsync, longitude, lowerCase, ltrim, mac, mask, maxDate, maxDateAsync, maxLength, maxLengthAsync, maxNumber, maxNumberAsync, maxTime, maxTimeAsync, minDate, minDateAsync, minLength, minLengthAsync, minNumber, minNumberAsync, minTime, minTimeAsync, mixinControlValueAccessor, mixinDisabled, model, noneOf, noneOfAsync, not, notEmpty, numeric, numericAsync, odd, oneOf, oneOfAsync, or, password, passwordAsync, pattern, patternAsync, port, prefix, primeNumber, prop, propArray, propObject, range, rangeAsync, required, requiredTrue, rtrim, rule, sanitize, startsWith, startsWithAsync, stripLow, suffix, time, timeAsync, toBoolean, toDate, toDouble, toFloat, toInt, toString, trim, unique, upperCase, url, urlAsync, whitelist };
 //# sourceMappingURL=messaia-cdk.mjs.map