@stemy/ngx-dynamic-form 10.2.33 → 12.0.1

package/bundles/stemy-ngx-dynamic-form.umd.js

@@ -1,163 +1,10 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@stemy/ngx-utils'), require('@ng-dynamic-forms/core'), require('rxjs'), require('@angular/core'), require('@angular/forms'), require('rxjs/operators'), require('@angular/common')) :
-    typeof define === 'function' && define.amd ? define('@stemy/ngx-dynamic-form', ['exports', '@stemy/ngx-utils', '@ng-dynamic-forms/core', 'rxjs', '@angular/core', '@angular/forms', 'rxjs/operators', '@angular/common'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.stemy = global.stemy || {}, global.stemy['ngx-dynamic-form'] = {}), global.ngxUtils, global.core, global.rxjs, global.ng.core, global.ng.forms, global.rxjs.operators, global.ng.common));
-}(this, (function (exports, ngxUtils, core, rxjs, core$1, forms, operators, common) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/forms'), require('@stemy/ngx-utils'), require('@angular/common'), require('rxjs/operators')) :
+    typeof define === 'function' && define.amd ? define('@stemy/ngx-dynamic-form', ['exports', '@angular/core', '@angular/forms', '@stemy/ngx-utils', '@angular/common', 'rxjs/operators'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.stemy = global.stemy || {}, global.stemy["ngx-dynamic-form"] = {}), global.ng.core, global.ng.forms, global["@stemy/ngx-utils"], global.ng.common, global.rxjs.operators));
+})(this, (function (exports, core, forms, ngxUtils, common, operators) { 'use strict';
 
-    // --- Decorator functions ---
-    function defaultSerializer(id, parent) {
-        var control = parent.get(id);
-        return !control ? null : control.value;
-    }
-    function FormSerializable(serializer) {
-        return function (target, propertyKey) {
-            ngxUtils.ReflectUtils.defineMetadata("dynamicFormSerializer", serializer || defaultSerializer, target, propertyKey);
-        };
-    }
-    function FormInput(data) {
-        return function (target, propertyKey) {
-            var meta = ngxUtils.ReflectUtils.getOwnMetadata("design:type", target, propertyKey);
-            var type = meta ? meta.name : "";
-            var inputType = propertyKey.indexOf("password") < 0 ? "text" : "password";
-            switch (type) {
-                case "Number":
-                    inputType = "number";
-                    break;
-                case "Boolean":
-                    inputType = "checkbox";
-                    break;
-            }
-            defineFormControl(target, propertyKey, createFormInput(propertyKey, data, inputType));
-        };
-    }
-    function FormSelect(data) {
-        return function (target, propertyKey) {
-            defineFormControl(target, propertyKey, createFormSelect(propertyKey, data));
-        };
-    }
-    function FormStatic(data) {
-        return function (target, propertyKey) {
-            defineFormControl(target, propertyKey, createFormStatic(propertyKey, data));
-        };
-    }
-    function FormModel(data) {
-        return function (target, propertyKey) {
-            defineFormControl(target, propertyKey, createFormModel(propertyKey, data));
-        };
-    }
-    function FormFile(data) {
-        return function (target, propertyKey) {
-            defineFormControl(target, propertyKey, createFormFile(propertyKey, data));
-        };
-    }
-    function defineFormControl(target, propertyKey, control) {
-        ngxUtils.ReflectUtils.defineMetadata("dynamicFormControl", control, target, propertyKey);
-    }
-    function getFormControl(target, propertyKey) {
-        return ngxUtils.ReflectUtils.getMetadata("dynamicFormControl", target, propertyKey);
-    }
-    function getFormSerializer(target, propertyKey) {
-        return ngxUtils.ReflectUtils.getMetadata("dynamicFormSerializer", target, propertyKey);
-    }
-    function createFormControl(id, type, config) {
-        config = config || { id: id };
-        config.id = id;
-        config.label = ngxUtils.ObjectUtils.isNullOrUndefined(config.label) ? id : config.label;
-        config.disabled = config.disabled || false;
-        config.hidden = config.hidden || false;
-        return { id: id, type: type, config: config };
-    }
-    function createFormInput(id, config, type) {
-        if (type === void 0) { type = "text"; }
-        var control = createFormControl(id, "input", config);
-        config = control.config;
-        config.inputType = config.inputType || type;
-        config.placeholder = config.placeholder || (config.inputType == "mask" ? "_" : "");
-        config.step = config.step || 1;
-        config.mask = config.mask || [/\w*/gi];
-        return control;
-    }
-    function createFormSelect(id, data) {
-        var control = createFormControl(id, "select", data);
-        data = control.config;
-        data.options = data.options || [];
-        return control;
-    }
-    function createFormStatic(id, config) {
-        return createFormControl(id, "static", config);
-    }
-    function createFormModel(id, data) {
-        var control = createFormControl(id, "group", data);
-        data = control.config;
-        data.name = data.name || "";
-        return control;
-    }
-    function createFormFile(id, data) {
-        var control = createFormControl(id, "file", data);
-        data = control.config;
-        data.accept = data.accept || ["jpg", "jpeg", "png"];
-        data.multiple = data.multiple || false;
-        data.url = ngxUtils.ObjectUtils.isString(data.url) ? data.url : "assets";
-        return control;
-    }
-
-    function validateJSON(control) {
-        var value = control.value;
-        if (!value)
-            return null;
-        try {
-            JSON.parse(value);
-            return null;
-        }
-        catch (e) {
-            return { json: true };
-        }
-    }
-    function validateRequiredTranslation(control) {
-        var value = control.value;
-        if (!value || value.length == 0)
-            return { requiredTranslation: true };
-        return value.findIndex(function (t) { return (t.lang == "de" || t.lang == "en") && !t.translation; }) < 0
-            ? null
-            : { requiredTranslation: true };
-    }
-    function validatePhone(control) {
-        var value = control.value;
-        if (!value)
-            return Promise.resolve(null);
-        var phoneRegexp = /^(?:\d){10,12}$/;
-        return phoneRegexp.test(value) ? null : { phone: true };
-    }
-    function validateItemsMinLength(minLength) {
-        return function (control) {
-            var value = control.value;
-            return (Array.isArray(value) && value.every(function (v) { return typeof v == "string" && v.length >= minLength; }))
-                ? null : { itemsMinLength: minLength };
-        };
-    }
-    function validateItemsMaxLength(maxLength) {
-        return function (control) {
-            var value = control.value;
-            return (Array.isArray(value) && value.every(function (v) { return typeof v == "string" && v.length <= maxLength; }))
-                ? null : { itemsMaxLength: maxLength };
-        };
-    }
-    function validateItemsMinValue(min) {
-        return function (control) {
-            var value = control.value;
-            return (Array.isArray(value) && value.every(function (v) { return typeof v == "number" && v >= min; }))
-                ? null : { itemsMinValue: min };
-        };
-    }
-    function validateItemsMaxValue(max) {
-        return function (control) {
-            var value = control.value;
-            return (Array.isArray(value) && value.every(function (v) { return typeof v == "number" && v <= max; }))
-                ? null : { itemsMaxValue: max };
-        };
-    }
-
-    /******************************************************************************
+    /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -319,11 +166,7 @@
     var __createBinding = Object.create ? (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
-        var desc = Object.getOwnPropertyDescriptor(m, k);
-        if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-            desc = { enumerable: true, get: function () { return m[k]; } };
-        }
-        Object.defineProperty(o, k2, desc);
+        Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
     }) : (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
@@ -387,16 +230,10 @@
                 r[k] = a[j];
         return r;
     }
-    function __spreadArray(to, from, pack) {
-        if (pack || arguments.length === 2)
-            for (var i = 0, l = from.length, ar; i < l; i++) {
-                if (ar || !(i in from)) {
-                    if (!ar)
-                        ar = Array.prototype.slice.call(from, 0, i);
-                    ar[i] = from[i];
-                }
-            }
-        return to.concat(ar || Array.prototype.slice.call(from));
+    function __spreadArray(to, from) {
+        for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+            to[j] = from[i];
+        return to;
     }
     function __await(v) {
         return this instanceof __await ? (this.v = v, this) : new __await(v);
@@ -462,688 +299,1076 @@
     function __importDefault(mod) {
         return (mod && mod.__esModule) ? mod : { default: mod };
     }
-    function __classPrivateFieldGet(receiver, state, kind, f) {
-        if (kind === "a" && !f)
-            throw new TypeError("Private accessor was defined without a getter");
-        if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
-            throw new TypeError("Cannot read private member from an object whose class did not declare it");
-        return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-    }
-    function __classPrivateFieldSet(receiver, state, value, kind, f) {
-        if (kind === "m")
-            throw new TypeError("Private method is not writable");
-        if (kind === "a" && !f)
-            throw new TypeError("Private accessor was defined without a setter");
-        if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
-            throw new TypeError("Cannot write private member to an object whose class did not declare it");
-        return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-    }
-    function __classPrivateFieldIn(state, receiver) {
-        if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function"))
-            throw new TypeError("Cannot use 'in' operator on non-object");
-        return typeof state === "function" ? receiver === state : state.has(receiver);
-    }
-
-    var DynamicFormArrayModel = /** @class */ (function (_super) {
-        __extends(DynamicFormArrayModel, _super);
-        function DynamicFormArrayModel(config, layout) {
-            var _this = _super.call(this, config, layout) || this;
-            _this.useTabs = config.useTabs || false;
-            _this.saveTab = ngxUtils.ObjectUtils.isFunction(config.saveTab) ? config.saveTab : (function (index, model) {
-                model.tabIndex = index;
-            });
-            _this.restoreTab = ngxUtils.ObjectUtils.isFunction(config.restoreTab) ? config.restoreTab : (function (model) {
-                return model.tabIndex;
-            });
-            _this.additional = config.additional || {};
-            return _this;
-        }
-        return DynamicFormArrayModel;
-    }(core.DynamicFormArrayModel));
-
-    var indexLabels = ["$ix", "$pix"];
-    var FormSubject = /** @class */ (function (_super) {
-        __extends(FormSubject, _super);
-        function FormSubject(notifyCallback) {
-            var _this = _super.call(this) || this;
-            _this.notifyCallback = notifyCallback;
-            return _this;
-        }
-        FormSubject.prototype.handleNotifiedValue = function (controlModel, control, val) {
-            var _this = this;
-            val.then(function (v) { return _this.next(v); });
-        };
-        FormSubject.prototype.notify = function (controlModel, control, root) {
-            var indexes = {};
-            var path = controlModel;
-            var ix = 0;
-            while (path) {
-                if (!isNaN(path.index)) {
-                    var key = indexLabels[ix++] || "$pix" + ix;
-                    indexes[key] = path.index;
-                }
-                path = path.parent;
-            }
-            var value = this.notifyCallback(controlModel, control, root, indexes);
-            if (!(value instanceof Promise)) {
-                value = Promise.resolve(value);
-            }
-            this.handleNotifiedValue(controlModel, control, value);
-        };
-        return FormSubject;
-    }(rxjs.Subject));
-
-    var FormSelectSubject = /** @class */ (function (_super) {
-        __extends(FormSelectSubject, _super);
-        function FormSelectSubject() {
-            return _super !== null && _super.apply(this, arguments) || this;
+    function __classPrivateFieldGet(receiver, privateMap) {
+        if (!privateMap.has(receiver)) {
+            throw new TypeError("attempted to get private field on non-instance");
         }
-        FormSelectSubject.prototype.handleNotifiedValue = function (controlModel, control, val) {
-            var _this = this;
-            val.then(function (options) {
-                var _a, _b;
-                _this.next(options);
-                if (options.length == 0)
-                    return;
-                var currentVal = control.value;
-                if (controlModel.multiple) {
-                    var correctVal = (currentVal || []).filter(function (t) { return options.findIndex(function (o) { return o.value == t; }) >= 0; });
-                    if (correctVal.length !== (currentVal === null || currentVal === void 0 ? void 0 : currentVal.length)) {
-                        control.setValue(correctVal, { onlySelf: true, emitEvent: false });
-                    }
-                    return;
-                }
-                var option = options.find(function (t) { return t.value == currentVal; });
-                if (!option) {
-                    control.setValue((_b = (_a = options[0]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : null, { onlySelf: true, emitEvent: false });
-                }
-            });
-        };
-        return FormSelectSubject;
-    }(FormSubject));
-
-    function isStringWithVal(val) {
-        return typeof val == "string" && val.length > 0;
+        return privateMap.get(receiver);
     }
-    function collectPathAble(start, getter) {
-        if (!start || !getter(start))
-            return [];
-        var parts = [];
-        var currentPath = start;
-        while (currentPath) {
-            var val = getter(currentPath);
-            if (val) {
-                parts.unshift(val);
-            }
-            currentPath = currentPath.parent;
+    function __classPrivateFieldSet(receiver, privateMap, value) {
+        if (!privateMap.has(receiver)) {
+            throw new TypeError("attempted to set private field on non-instance");
         }
-        return parts;
+        privateMap.set(receiver, value);
+        return value;
     }
 
-    var DynamicFormService = /** @class */ (function (_super) {
-        __extends(DynamicFormService, _super);
-        function DynamicFormService(cs, vs, openApi, injector) {
-            var _this = _super.call(this, cs, vs) || this;
-            _this.openApi = openApi;
-            _this.injector = injector;
-            _this.onDetectChanges = new core$1.EventEmitter();
-            return _this;
+    var FORM_GROUP_TYPE = new core.InjectionToken("form-group-provider");
+    var FORM_CONTROL_PROVIDER = new core.InjectionToken("form-control-provider");
+    var FormControlComponent = /** @class */ (function () {
+        function FormControlComponent() {
         }
-        Object.defineProperty(DynamicFormService.prototype, "api", {
+        Object.defineProperty(FormControlComponent.prototype, "form", {
             get: function () {
-                return this.openApi.api;
+                return !this.control ? null : this.control.form;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(DynamicFormService.prototype, "language", {
+        Object.defineProperty(FormControlComponent.prototype, "data", {
             get: function () {
-                return this.api.language;
+                return (!this.control ? {} : this.control.data);
             },
             enumerable: false,
             configurable: true
         });
-        DynamicFormService.prototype.patchGroup = function (value, formModel, formGroup) {
-            this.patchValueRecursive(value, formModel, formGroup);
-            this.detectChanges();
-            formGroup.patchValue(ngxUtils.ObjectUtils.copy(value));
-        };
-        DynamicFormService.prototype.patchForm = function (value, component) {
-            this.patchValueRecursive(value, component.model, component.group);
-            this.detectChanges(component);
-            component.group.patchValue(value);
-        };
-        DynamicFormService.prototype.serialize = function (formModel, formGroup) {
-            return this.serializeRecursive(formModel, formGroup);
-        };
-        DynamicFormService.prototype.notifyChanges = function (formModel, formGroup, root) {
-            this.notifyChangesRecursive(formModel, formGroup, root);
-        };
-        DynamicFormService.prototype.updateSelectOptions = function (formControlModel, formControl, root) {
-            if (formControlModel instanceof core.DynamicSelectModel) {
-                var options = formControlModel.options$;
-                if (options instanceof FormSubject) {
-                    options.notify(formControlModel, formControl, root);
-                    return;
-                }
-                while (options instanceof rxjs.Subject && options.source) {
-                    options = options.source;
-                    if (options instanceof FormSubject) {
-                        options.notify(formControlModel, formControl, root);
-                    }
-                }
-            }
-        };
-        DynamicFormService.prototype.showErrors = function (form) {
-            this.showErrorsForGroup(form.group);
-            this.detectChanges(form);
-        };
-        DynamicFormService.prototype.detectChanges = function (formComponent) {
-            _super.prototype.detectChanges.call(this, formComponent);
-            this.onDetectChanges.emit(formComponent);
-        };
-        DynamicFormService.prototype.patchValueRecursive = function (value, formModel, formGroup) {
-            var _this = this;
-            Object.keys(value).forEach(function (key) {
-                var subModel = _this.findModelById(key, formModel);
-                var subValue = value[key];
-                if (!subModel)
-                    return;
-                var subControl = _this.findControlByModel(subModel, formGroup);
-                if (subModel instanceof core.DynamicSelectModel && ngxUtils.ObjectUtils.isObject(subValue)) {
-                    value[key] = subValue.id || subValue._id || subValue;
-                    return;
-                }
-                if (subModel instanceof core.DynamicFormArrayModel) {
-                    var length = Array.isArray(subValue) ? subValue.length : 0;
-                    var subArray = subControl;
-                    while (subModel.size > length) {
-                        _this.removeFormArrayGroup(0, subArray, subModel);
-                    }
-                    while (subModel.size < length) {
-                        _this.insertFormArrayGroup(subModel.size, subArray, subModel);
-                    }
-                    for (var i = 0; i < length; i++) {
-                        var itemModel = subModel.get(i);
-                        _this.patchValueRecursive(subValue[i], itemModel.group, subArray.at(i));
-                    }
+        Object.defineProperty(FormControlComponent.prototype, "value", {
+            get: function () {
+                return !this.control ? null : this.control.value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(FormControlComponent.prototype, "meta", {
+            get: function () {
+                return !this.control ? null : this.control.meta;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(FormControlComponent.prototype, "testId", {
+            get: function () {
+                var _a, _b;
+                var prefix = ((_a = this.form) === null || _a === void 0 ? void 0 : _a.testId) || "form";
+                return prefix + "-" + (((_b = this.control) === null || _b === void 0 ? void 0 : _b.id) || "ctrl");
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(FormControlComponent.prototype, "inputClass", {
+            get: function () {
+                return true;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return FormControlComponent;
+    }());
+    FormControlComponent.decorators = [
+        { type: core.Directive }
+    ];
+    FormControlComponent.propDecorators = {
+        inputClass: [{ type: core.HostBinding, args: ["class.form-input",] }]
+    };
+    function createValidator(control) {
+        var data = control.data || {};
+        var validators = [data.validator].concat(data.validators || []).filter(ngxUtils.ObjectUtils.isDefined).map(function (v) {
+            return ngxUtils.ReflectUtils.resolve(v, control.injector);
+        });
+        return function (ctrl) { return new Promise(function (resolve) {
+            var control = ctrl;
+            control.shouldValidate().then(function (should) {
+                if (!should) {
+                    resolve(null);
                     return;
                 }
-                if (subModel instanceof core.DynamicFormGroupModel) {
-                    _this.patchValueRecursive(subValue, subModel.group, subControl);
+                var validate = validators.map(function (v) { return v(control); });
+                var metaValidator = control.meta.validator;
+                if (ngxUtils.ObjectUtils.isFunction(metaValidator)) {
+                    validate.push(metaValidator(control));
                 }
-            });
-        };
-        DynamicFormService.prototype.serializeRecursive = function (formModel, formGroup) {
-            var _a, _b;
-            return __awaiter(this, void 0, void 0, function () {
-                var result, _c, _d, _i, i, subModel, subControl, serializer, _e, _f, length, subArray, resArray, i_1, itemModel, _g, _h, _j, _k;
-                return __generator(this, function (_l) {
-                    switch (_l.label) {
-                        case 0:
-                            result = {};
-                            if (!formModel || !formGroup || !formGroup.value)
-                                return [2 /*return*/, result];
-                            _c = [];
-                            for (_d in formModel)
-                                _c.push(_d);
-                            _i = 0;
-                            _l.label = 1;
-                        case 1:
-                            if (!(_i < _c.length)) return [3 /*break*/, 12];
-                            i = _c[_i];
-                            subModel = formModel[i];
-                            subControl = this.findControlByModel(subModel, formGroup);
-                            serializer = (_a = subModel.additional) === null || _a === void 0 ? void 0 : _a.serializer;
-                            if (!ngxUtils.ObjectUtils.isFunction(serializer)) return [3 /*break*/, 3];
-                            _e = result;
-                            _f = subModel.id;
-                            return [4 /*yield*/, serializer(subModel, subControl)];
-                        case 2:
-                            _e[_f] = _l.sent();
-                            return [3 /*break*/, 11];
-                        case 3:
-                            if (!(subModel instanceof core.DynamicFormArrayModel)) return [3 /*break*/, 8];
-                            length = Array.isArray(subControl.value) ? subControl.value.length : 0;
-                            subArray = subControl;
-                            resArray = [];
-                            i_1 = 0;
-                            _l.label = 4;
-                        case 4:
-                            if (!(i_1 < length)) return [3 /*break*/, 7];
-                            itemModel = subModel.get(i_1);
-                            _h = (_g = resArray).push;
-                            return [4 /*yield*/, this.serializeRecursive(itemModel.group, subArray.at(i_1))];
-                        case 5:
-                            _h.apply(_g, [_l.sent()]);
-                            _l.label = 6;
-                        case 6:
-                            i_1++;
-                            return [3 /*break*/, 4];
-                        case 7:
-                            result[subModel.id] = resArray;
-                            return [3 /*break*/, 11];
-                        case 8:
-                            if (!(subModel instanceof core.DynamicFormGroupModel)) return [3 /*break*/, 10];
-                            _j = result;
-                            _k = subModel.id;
-                            return [4 /*yield*/, this.serializeRecursive(subModel.group, subControl)];
-                        case 9:
-                            _j[_k] = _l.sent();
-                            return [3 /*break*/, 11];
-                        case 10:
-                            if (subModel instanceof core.DynamicInputModel && !ngxUtils.ObjectUtils.isNullOrUndefined(subControl.value)) {
-                                result[subModel.id] = subModel.inputType == "number"
-                                    ? (_b = parseFloat(("" + subControl.value || "0").replace(/,/gi, "."))) !== null && _b !== void 0 ? _b : null : subControl.value;
-                                return [3 /*break*/, 11];
+                Promise.all(validate).then(function (results) {
+                    results = results.filter(function (error) { return ngxUtils.ObjectUtils.isObject(error) || ngxUtils.ObjectUtils.isString(error); });
+                    var result = null;
+                    if (results.length > 0) {
+                        result = {};
+                        results.forEach(function (error) {
+                            if (ngxUtils.ObjectUtils.isString(error)) {
+                                result[error] = {};
+                                return;
                             }
-                            result[subModel.id] = subControl.value;
-                            _l.label = 11;
-                        case 11:
-                            _i++;
-                            return [3 /*break*/, 1];
-                        case 12: return [2 /*return*/, result];
+                            result = Object.assign(result, error);
+                        });
                     }
+                    resolve(result);
                 });
             });
-        };
-        DynamicFormService.prototype.notifyChangesRecursive = function (formModel, formGroup, root) {
-            if (!formModel || !formGroup)
-                return;
-            for (var i in formModel) {
-                var subModel = formModel[i];
-                var subControl = this.findControlByModel(subModel, formGroup);
-                if (subModel instanceof core.DynamicFormArrayModel) {
-                    var length = Array.isArray(subControl.value) ? subControl.value.length : 0;
-                    var subArray = subControl;
-                    for (var i_2 = 0; i_2 < length; i_2++) {
-                        var itemModel = subModel.get(i_2);
-                        this.notifyChangesRecursive(itemModel.group, subArray.at(i_2), root);
-                    }
-                    continue;
-                }
-                if (subModel instanceof core.DynamicFormGroupModel) {
-                    this.notifyChangesRecursive(subModel.group, subControl, root);
-                    continue;
-                }
-                this.updateSelectOptions(subModel, subControl, root);
-            }
-        };
-        DynamicFormService.prototype.showErrorsForGroup = function (formGroup) {
-            if (!formGroup)
-                return;
-            formGroup.markAsTouched({ onlySelf: true });
-            var controls = Object.keys(formGroup.controls).map(function (id) { return formGroup.controls[id]; });
-            this.showErrorsForControls(controls);
-        };
-        DynamicFormService.prototype.showErrorsForControls = function (controls) {
-            var _this = this;
-            controls.forEach(function (control) {
-                if (control instanceof forms.FormGroup) {
-                    _this.showErrorsForGroup(control);
-                    return;
-                }
-                control.markAsTouched({ onlySelf: true });
-                if (control instanceof forms.FormArray) {
-                    _this.showErrorsForControls(control.controls);
-                }
+        }); };
+    }
+    var DynamicFormControlHelper = /** @class */ (function () {
+        function DynamicFormControlHelper(form, control) {
+            if (control === void 0) { control = null; }
+            this.form = form;
+            this.control = control;
+            this.formId = ngxUtils.UniqueUtils.uuid();
+            this.meta = {};
+            this.hidden = false;
+            this.dummyData = {};
+            this.readonlyTester = this.createTester("readonly");
+            this.hideTester = this.createTester("hidden");
+            this.serializeTester = this.createTester("shouldSerialize", function (control) {
+                return Promise.resolve(control.visible);
             });
+            this.validateTester = this.createTester("shouldValidate", function (control) {
+                return Promise.resolve(control.visible);
+            });
+        }
+        Object.defineProperty(DynamicFormControlHelper.prototype, "id", {
+            get: function () {
+                return !this.control ? null : this.control.id;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControlHelper.prototype, "type", {
+            get: function () {
+                return !this.control ? "" : this.control.type;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControlHelper.prototype, "data", {
+            get: function () {
+                return !this.control ? this.dummyData : this.control.data || this.dummyData;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControlHelper.prototype, "visible", {
+            get: function () {
+                return !this.hidden;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControlHelper.prototype, "provider", {
+            get: function () {
+                return this.ctrlProvider;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DynamicFormControlHelper.prototype.load = function (control) {
+            return !this.ctrlProvider ? Promise.resolve(null) : this.ctrlProvider.loader(control);
         };
-        DynamicFormService.prototype.getFormModelForSchema = function (name, customizeModel) {
-            return __awaiter(this, void 0, void 0, function () {
-                var _c, customizeModels;
-                var _this = this;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            this.api.cache = {};
-                            _c = this;
-                            return [4 /*yield*/, this.openApi.getSchemas()];
-                        case 1:
-                            _c.schemas = _d.sent();
-                            customizeModels = function (property, schema, modelType, config) {
-                                var model = new modelType(config);
-                                if (!ngxUtils.ObjectUtils.isFunction(customizeModel))
-                                    return [model];
-                                var res = customizeModel(property, schema, model, config, _this.injector);
-                                return Array.isArray(res) ? res : [res];
-                            };
-                            return [2 /*return*/, this.getFormModelForSchemaDef(this.schemas[name], customizeModels)];
-                    }
+        DynamicFormControlHelper.prototype.check = function (control) {
+            var _this = this;
+            return new Promise(function (resolve) {
+                _this.hideTester(control).then(function (hide) {
+                    _this.hidden = hide;
+                    _this.readonlyTester(control).then(function (readonly) {
+                        resolve(control.form.readonly || readonly);
+                    });
                 });
             });
         };
-        DynamicFormService.prototype.getFormModelForSchemaDef = function (schema, customizeModels) {
-            var e_1, _c;
-            if (!schema)
-                return [];
-            var keys = Object.keys(schema.properties || {});
-            var controls = [];
-            try {
-                for (var keys_1 = __values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
-                    var p = keys_1_1.value;
-                    var property = schema.properties[p];
-                    controls.push.apply(controls, __spread(this.getFormControlModels(property, schema, customizeModels)));
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (keys_1_1 && !keys_1_1.done && (_c = keys_1.return)) _c.call(keys_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            return controls.filter(function (t) { return null !== t; });
-        };
-        DynamicFormService.prototype.getFormControlModels = function (property, schema, customizeModels) {
-            var _a, _b;
-            var $enum = ((_a = property.items) === null || _a === void 0 ? void 0 : _a.enum) || property.enum;
-            if (Array.isArray($enum) || isStringWithVal(property.optionsPath) || isStringWithVal(property.endpoint)) {
-                return customizeModels(property, schema, core.DynamicSelectModel, this.getFormSelectConfig(property, schema));
-            }
-            switch (property.type) {
-                case "string":
-                case "number":
-                case "integer":
-                    return customizeModels(property, schema, core.DynamicInputModel, this.getFormInputConfig(property, schema));
-                case "textarea":
-                    return customizeModels(property, schema, core.DynamicTextAreaModel, this.getFormTextareaConfig(property, schema));
-                case "boolean":
-                    return customizeModels(property, schema, core.DynamicCheckboxModel, this.getFormCheckboxConfig(property, schema));
-                case "array":
-                    if (((_b = property.items) === null || _b === void 0 ? void 0 : _b.$ref) || property.$ref) {
-                        return customizeModels(property, schema, DynamicFormArrayModel, this.getFormArrayConfig(property, schema, customizeModels));
-                    }
-                    else {
-                        return customizeModels(property, schema, core.DynamicInputModel, this.getFormInputConfig(property, schema));
-                    }
-                case "file":
-                    return customizeModels(property, schema, core.DynamicFileUploadModel, this.getFormUploadConfig(property, schema));
-            }
-            if (property.$ref) {
-                return customizeModels(property, schema, core.DynamicFormGroupModel, this.getFormGroupConfig(property, schema, customizeModels));
-            }
-            return [];
-        };
-        DynamicFormService.prototype.findModelByPath = function (parent, path) {
-            if (path.length == 0)
-                return parent;
-            var next = path.shift();
-            if (Array.isArray(parent)) {
-                return this.findModelByPath(parent.find(function (t) { return t.id == next; }), path);
-            }
-            if (parent instanceof core.DynamicFormGroupModel) {
-                return this.findModelByPath(parent.group.find(function (t) { return t.id == next; }), path);
-            }
-            if (parent instanceof DynamicFormArrayModel) {
-                return this.findModelByPath(parent.groups.find(function (t) { return t.index == next; }), path);
-            }
-            return parent;
+        DynamicFormControlHelper.prototype.shouldSerialize = function (control) {
+            return this.serializeTester(control);
         };
-        DynamicFormService.prototype.getFormControlConfig = function (property, schema) {
-            var validators = this.getValidators(property, schema);
-            var errorMessages = Object.keys(validators).reduce(function (res, key) {
-                res[key] = "error." + key;
-                return res;
-            }, {});
-            return {
-                id: property.id,
-                label: ngxUtils.ObjectUtils.isString(property.label) ? property.label : property.id,
-                hidden: property.hidden,
-                disabled: property.disabled,
-                validators: validators,
-                errorMessages: errorMessages,
-                additional: Object.assign({}, property)
-            };
+        DynamicFormControlHelper.prototype.shouldValidate = function (control) {
+            return this.validateTester(control);
         };
-        DynamicFormService.prototype.getFormArrayConfig = function (property, schema, customizeModels) {
-            var _this = this;
-            var _a;
-            var ref = ((_a = property.items) === null || _a === void 0 ? void 0 : _a.$ref) || property.$ref || "";
-            var subSchema = this.schemas[ref.split("/").pop()];
-            return Object.assign(this.getFormControlConfig(property, schema), {
-                groupFactory: function () { return _this.getFormModelForSchemaDef(subSchema, customizeModels); },
-                useTabs: property.useTabs || false
-            });
+        DynamicFormControlHelper.prototype.findProvider = function (control) {
+            this.ctrlProvider = !this.control || !this.control.type ? null : this.form.findProvider(control);
         };
-        DynamicFormService.prototype.getFormGroupConfig = function (property, schema, customizeModels) {
-            var ref = property.$ref || "";
-            var subSchema = this.schemas[ref.split("/").pop()];
-            return Object.assign(this.getFormControlConfig(property, schema), { group: this.getFormModelForSchemaDef(subSchema, customizeModels) });
+        DynamicFormControlHelper.prototype.createTester = function (test, defaultFunc) {
+            if (defaultFunc === void 0) { defaultFunc = null; }
+            var tester = this.data[test]
+                ? ngxUtils.ReflectUtils.resolve(this.data[test], this.form.injector)
+                : (defaultFunc || (function () { return Promise.resolve(false); }));
+            return function (control) { return tester(control); };
         };
-        DynamicFormService.prototype.getFormInputConfig = function (property, schema) {
-            var _a;
-            var inputType = ngxUtils.StringUtils.has(property.id, "password", "Password") ? "password" : (property.format || ((_a = property.items) === null || _a === void 0 ? void 0 : _a.type) || property.type);
-            switch (inputType) {
-                case "boolean":
-                    inputType = "checkbox";
-                    break;
-                case "textarea":
-                    inputType = "textarea";
-                    break;
-                case "integer":
-                    inputType = "number";
-                    break;
+        return DynamicFormControlHelper;
+    }());
+    var DynamicFormGroup = /** @class */ (function (_super) {
+        __extends(DynamicFormGroup, _super);
+        function DynamicFormGroup(form, control) {
+            if (control === void 0) { control = null; }
+            var _this = _super.call(this, {}, { updateOn: ((!control || !control.data) ? null : control.data.updateOn) || form.updateOn || "blur" }) || this;
+            _this.form = form;
+            _this.mName = "";
+            _this.mModel = {};
+            _this.mControls = [];
+            _this.mSerializers = [];
+            _this.mFieldSets = {};
+            _this.helper = new DynamicFormControlHelper(form, control);
+            _this.helper.findProvider(_this);
+            _this.initialized = false;
+            _this.loading = false;
+            _this.changeTimer = ngxUtils.TimerUtils.createTimeout();
+            _this.statusChanges.subscribe(function () {
+                var root = _this.form.root;
+                root.onStatusChange.emit(root);
+            });
+            _this.setAsyncValidators(createValidator(_this));
+            return _this;
+        }
+        Object.defineProperty(DynamicFormGroup.prototype, "id", {
+            get: function () {
+                return this.helper.id;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "type", {
+            get: function () {
+                return this.helper.type;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "data", {
+            get: function () {
+                return this.helper.data;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "visible", {
+            get: function () {
+                return this.helper.visible;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "meta", {
+            get: function () {
+                return this.helper.meta;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "injector", {
+            get: function () {
+                return this.form.injector;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "label", {
+            get: function () {
+                return this.data.label !== "" ? "" + this.prefix + this.data.label : "";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "provider", {
+            get: function () {
+                return this.helper.provider;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "model", {
+            get: function () {
+                return this.mModel;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "formId", {
+            get: function () {
+                return this.helper.formId;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "formControls", {
+            get: function () {
+                return this.mControls || [];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "formFields", {
+            get: function () {
+                return this.mFieldSets || {};
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "prefix", {
+            get: function () {
+                return !this.name ? "" : this.name + ".";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "name", {
+            get: function () {
+                return this.mName;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormGroup.prototype, "state", {
+            get: function () {
+                return (this.loading ? "LOADING" : this.status);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DynamicFormGroup.createFormControls = function (group, controls) {
+            if (!controls && ngxUtils.ObjectUtils.isObject(group.model)) {
+                var props = Object.keys(group.model);
+                controls = props.map(function (id) {
+                    return getFormControl(group.model, id);
+                }).filter(ngxUtils.ObjectUtils.isDefined);
             }
-            var sub = property.type == "array" ? property.items || property : property;
-            return Object.assign(this.getFormControlConfig(property, schema), {
-                inputType: inputType,
-                autoComplete: property.autoComplete || "off",
-                multiple: property.type == "array",
-                accept: ngxUtils.ObjectUtils.isString(property.accept) ? property.accept : null,
-                mask: ngxUtils.ObjectUtils.isString(property.mask) ? property.mask : null,
-                pattern: ngxUtils.ObjectUtils.isString(property.pattern) ? property.pattern : null,
-                step: isNaN(sub.step) ? (isNaN(property.step) ? 1 : property.step) : sub.step,
-                min: isNaN(sub.minimum) ? Number.MIN_SAFE_INTEGER : sub.minimum,
-                max: isNaN(sub.maximum) ? Number.MAX_SAFE_INTEGER : sub.maximum,
-                minLength: isNaN(sub.minLength) ? Number.MIN_SAFE_INTEGER : sub.minLength,
-                maxLength: isNaN(sub.maxLength) ? Number.MAX_SAFE_INTEGER : sub.maxLength,
-                placeholder: property.placeholder || ""
+            if (!controls)
+                return [];
+            return controls.map(function (ctrl) {
+                if (ctrl.type == "model") {
+                    var subGroup = new DynamicFormGroup(group.form, ctrl);
+                    var model = group.model[ctrl.id] || {};
+                    var data = subGroup.getData();
+                    data.name = data.name || group.name;
+                    subGroup.setup(model, data);
+                    group.model[ctrl.id] = model;
+                    group.addControl(subGroup.id, subGroup);
+                    return subGroup;
+                }
+                return new DynamicFormControl(ctrl, group);
             });
         };
-        DynamicFormService.prototype.getFormTextareaConfig = function (property, schema) {
-            return Object.assign(this.getFormControlConfig(property, schema), {
-                cols: property.cols || null,
-                rows: property.rows || 10,
-                wrap: property.wrap || false,
-                autoComplete: property.autoComplete || "off",
-                multiple: property.type == "array"
+        DynamicFormGroup.createFormSerializers = function (group, serializers) {
+            if (!serializers && ngxUtils.ObjectUtils.isObject(group.model)) {
+                var props = Object.keys(group.model);
+                serializers = props.reduce(function (result, id) {
+                    var serializer = getFormSerializer(group.model, id);
+                    if (!serializer)
+                        return result;
+                    result[id] = serializer;
+                    return result;
+                }, {});
+            }
+            if (!serializers)
+                return [];
+            return Object.keys(serializers).map(function (id) {
+                var serializer = serializers[id] || defaultSerializer;
+                return !serializer ? null : {
+                    id: id,
+                    func: ngxUtils.ReflectUtils.resolve(serializer, group.injector)
+                };
             });
         };
-        DynamicFormService.prototype.getFormSelectConfig = function (property, schema) {
-            return Object.assign(this.getFormControlConfig(property, schema), {
-                options: this.getFormSelectOptions(property, schema),
-                multiple: property.type == "array"
+        DynamicFormGroup.prototype.getData = function () {
+            return this.data;
+        };
+        DynamicFormGroup.prototype.getControl = function (id) {
+            return this.get(id);
+        };
+        DynamicFormGroup.prototype.load = function () {
+            var promises = this.mControls.map(function (c) { return c.load(); });
+            promises.push(this.helper.load(this));
+            return Promise.all(promises);
+        };
+        DynamicFormGroup.prototype.check = function () {
+            var _this = this;
+            return new Promise(function (resolve) {
+                _this.helper.check(_this).then(function (readonly) {
+                    if (readonly)
+                        _this.disable({ emitEvent: false });
+                    else
+                        _this.enable({ emitEvent: false });
+                    var promises = _this.mControls.map(function (c) { return c.check(); });
+                    Promise.all(promises).then(resolve);
+                });
+            });
+        };
+        DynamicFormGroup.prototype.shouldSerialize = function () {
+            return this.helper.shouldSerialize(this);
+        };
+        DynamicFormGroup.prototype.shouldValidate = function () {
+            return this.helper.shouldValidate(this);
+        };
+        DynamicFormGroup.prototype.serialize = function () {
+            var _this = this;
+            return new Promise(function (resolve) {
+                var result = {};
+                var serializers = _this.mSerializers.map(function (s) {
+                    return new Promise(function (resolve) {
+                        s.func(s.id, _this).then(function (res) {
+                            var ctrl = _this.getControl(s.id);
+                            var promise = !ctrl ? Promise.resolve(true) : ctrl.shouldSerialize();
+                            promise.then(function (should) {
+                                if (should)
+                                    result[s.id] = res;
+                                resolve(null);
+                            });
+                        });
+                    });
+                });
+                Promise.all(serializers).then(function () { return resolve(result); });
+            });
+        };
+        DynamicFormGroup.prototype.onFocus = function () {
+            this.markAsUntouched({ onlySelf: true });
+        };
+        DynamicFormGroup.prototype.onBlur = function () {
+            this.markAsTouched({ onlySelf: true });
+        };
+        DynamicFormGroup.prototype.showErrors = function () {
+            this.markAsTouched({ onlySelf: true });
+            this.mControls.forEach(function (ctrl) { return ctrl.showErrors(); });
+        };
+        DynamicFormGroup.prototype.reloadControls = function () {
+            var _this = this;
+            var callback = function () { };
+            if (this.initialized === false) {
+                this.initialized = true;
+                this.loading = true;
+                callback = function () {
+                    _this.loading = false;
+                    // this.cdr.detectChanges();
+                    var root = _this.form.root;
+                    root.onInit.emit(root);
+                    root.onStatusChange.emit(root);
+                    // https://github.com/angular/angular/issues/14542
+                    var statusTimer = ngxUtils.TimerUtils.createInterval();
+                    statusTimer.set(function () {
+                        if (_this.status == "PENDING")
+                            return;
+                        statusTimer.clear();
+                        root.onStatusChange.emit(root);
+                    }, 50);
+                    setTimeout(statusTimer.clear, 5000);
+                };
+            }
+            var promise = new Promise(function (resolve) {
+                _this.load().then(function () { return _this.check().then(resolve); });
+            });
+            promise.then(callback, callback);
+            return promise;
+        };
+        DynamicFormGroup.prototype.setup = function (model, info) {
+            var _this = this;
+            this.mName = info.name || "";
+            this.mModel = model;
+            this.mControls.forEach(function (ctrl) { return _this.removeControl(ctrl.id); });
+            this.mControls = DynamicFormGroup.createFormControls(this, info.controls);
+            this.mControls.forEach(function (ctrl) { return _this.addControl(ctrl.id, ctrl); });
+            this.mSerializers = DynamicFormGroup.createFormSerializers(this, info.serializers);
+            this.mFieldSets = info.fieldSets ? info.fieldSets.reduce(function (result, fs) {
+                result[fs.id] = fs;
+                return result;
+            }, {}) : getFormFieldSets(Object.getPrototypeOf(model).constructor);
+        };
+        DynamicFormGroup.prototype.updateModel = function (control) {
+            var _this = this;
+            this.model[control.id] = control.value;
+            this.changeTimer.clear();
+            this.changeTimer.set(function () {
+                _this.check().then(function () { return _this.reloadControlsFrom(control, new Set()).then(function () {
+                    _this.form.root.onChange.emit(control);
+                }); });
+            }, 250);
+        };
+        DynamicFormGroup.prototype.reloadControlsFrom = function (control, controls) {
+            var _this = this;
+            var data = control.data;
+            if (!data || !data.reload)
+                return Promise.resolve(null);
+            var reload = ngxUtils.ObjectUtils.isArray(data.reload) ? data.reload : [data.reload];
+            return Promise.all(reload.map(function (id) {
+                var nextControl = _this.getControl(id);
+                if (!nextControl || controls.has(nextControl))
+                    return Promise.resolve(null);
+                controls.add(nextControl);
+                return new Promise(function (resolve) {
+                    nextControl.load().then(function () {
+                        _this.reloadControlsFrom(nextControl, controls).then(resolve);
+                    });
+                });
+            }));
+        };
+        return DynamicFormGroup;
+    }(forms.FormGroup));
+    var DynamicFormControl = /** @class */ (function (_super) {
+        __extends(DynamicFormControl, _super);
+        function DynamicFormControl(control, group) {
+            var _this = _super.call(this, group.model[control.id], { updateOn: control.data.updateOn || group.updateOn }) || this;
+            _this.control = control;
+            _this.group = group;
+            _this.group.addControl(control.id, _this);
+            _this.helper = new DynamicFormControlHelper(_this.form, control);
+            _this.helper.findProvider(_this);
+            _this.valueChanges.subscribe(function () { return _this.group.updateModel(_this); });
+            _this.setAsyncValidators(createValidator(_this));
+            return _this;
+        }
+        Object.defineProperty(DynamicFormControl.prototype, "id", {
+            get: function () {
+                return this.helper.id;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "type", {
+            get: function () {
+                return this.helper.type;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "data", {
+            get: function () {
+                return this.helper.data;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "visible", {
+            get: function () {
+                return this.helper.visible;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "meta", {
+            get: function () {
+                return this.helper.meta;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "form", {
+            get: function () {
+                return this.group.form;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "injector", {
+            get: function () {
+                return this.form.injector;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "label", {
+            get: function () {
+                return this.data.label !== "" ? "" + this.group.prefix + this.data.label : "";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "provider", {
+            get: function () {
+                return this.helper.provider;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "model", {
+            get: function () {
+                return this.group.model;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormControl.prototype, "formId", {
+            get: function () {
+                return this.helper.formId;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DynamicFormControl.prototype.getData = function () {
+            return this.data;
+        };
+        DynamicFormControl.prototype.getControl = function (id) {
+            return null;
+        };
+        DynamicFormControl.prototype.load = function () {
+            return this.helper.load(this);
+        };
+        DynamicFormControl.prototype.check = function () {
+            var _this = this;
+            var check = this.helper.check(this);
+            check.then(function (readonly) {
+                if (readonly || _this.group.disabled)
+                    _this.disable({ emitEvent: false });
+                else
+                    _this.enable({ emitEvent: false });
             });
+            return check;
+        };
+        DynamicFormControl.prototype.shouldSerialize = function () {
+            return this.helper.shouldSerialize(this);
+        };
+        DynamicFormControl.prototype.shouldValidate = function () {
+            return this.helper.shouldValidate(this);
+        };
+        DynamicFormControl.prototype.serialize = function () {
+            return Promise.resolve(this.value);
+        };
+        DynamicFormControl.prototype.onFocus = function () {
+            this.markAsUntouched({ onlySelf: true });
+        };
+        DynamicFormControl.prototype.onBlur = function () {
+            this.markAsTouched({ onlySelf: true });
+        };
+        DynamicFormControl.prototype.showErrors = function () {
+            this.markAsTouched({ onlySelf: true });
+        };
+        return DynamicFormControl;
+    }(forms.FormControl));
+    // --- Decorator functions ---
+    var emptyArray = [];
+    var emptyTester = function () {
+        return Promise.resolve(false);
+    };
+    var ɵ0 = emptyTester;
+    function defaultSerializer(id, parent) {
+        var control = parent.getControl(id);
+        return !control ? Promise.resolve(parent.model[id]) : control.serialize();
+    }
+    function FormSerializable(serializer) {
+        return function (target, propertyKey) {
+            ngxUtils.ReflectUtils.defineMetadata("dynamicFormSerializer", serializer || defaultSerializer, target, propertyKey);
+        };
+    }
+    function FormInput(data) {
+        return function (target, propertyKey) {
+            var meta = ngxUtils.ReflectUtils.getOwnMetadata("design:type", target, propertyKey);
+            var type = meta ? meta.name : "";
+            var inputType = propertyKey.indexOf("password") < 0 ? "text" : "password";
+            switch (type) {
+                case "Number":
+                    inputType = "number";
+                    break;
+                case "Boolean":
+                    inputType = "checkbox";
+                    break;
+            }
+            defineFormControl(target, propertyKey, createFormInput(propertyKey, data, inputType));
+        };
+    }
+    function FormSelect(data) {
+        return function (target, propertyKey) {
+            defineFormControl(target, propertyKey, createFormSelect(propertyKey, data));
+        };
+    }
+    function FormStatic(data) {
+        return function (target, propertyKey) {
+            defineFormControl(target, propertyKey, createFormStatic(propertyKey, data));
+        };
+    }
+    function FormModel(data) {
+        return function (target, propertyKey) {
+            defineFormControl(target, propertyKey, createFormModel(propertyKey, data));
+        };
+    }
+    function FormFile(data) {
+        return function (target, propertyKey) {
+            defineFormControl(target, propertyKey, createFormFile(propertyKey, data));
+        };
+    }
+    function FormFieldSet(data) {
+        return function (target) {
+            var sets = getFormFieldSets(target);
+            data.classes = data.classes || "";
+            sets[data.id] = data;
+            ngxUtils.ReflectUtils.defineMetadata("dynamicFormFieldSets", sets, target);
+        };
+    }
+    function provideFormGroup(component) {
+        return {
+            provide: FORM_GROUP_TYPE,
+            useValue: component
+        };
+    }
+    function provideFormControl(component, acceptor, loader, priority) {
+        if (priority === void 0) { priority = 0; }
+        return {
+            provide: FORM_CONTROL_PROVIDER,
+            multi: true,
+            useValue: {
+                component: component,
+                priority: priority,
+                acceptor: acceptor,
+                loader: loader
+            }
+        };
+    }
+    function defineFormControl(target, propertyKey, control) {
+        ngxUtils.ReflectUtils.defineMetadata("dynamicFormControl", control, target, propertyKey);
+    }
+    function getFormFieldSets(target) {
+        return ngxUtils.ReflectUtils.getMetadata("dynamicFormFieldSets", target) || {};
+    }
+    function getFormControl(target, propertyKey) {
+        return ngxUtils.ReflectUtils.getMetadata("dynamicFormControl", target, propertyKey);
+    }
+    function getFormSerializer(target, propertyKey) {
+        return ngxUtils.ReflectUtils.getMetadata("dynamicFormSerializer", target, propertyKey);
+    }
+    function createFormControl(id, type, data) {
+        data = data || {};
+        data.label = ngxUtils.ObjectUtils.isNullOrUndefined(data.label) ? id : data.label;
+        data.labelAlign = data.labelAlign || "left";
+        data.fieldSet = data.fieldSet || ngxUtils.UniqueUtils.uuid();
+        data.classes = data.classes || "";
+        data.readonly = data.readonly || emptyTester;
+        data.hidden = data.hidden || emptyTester;
+        data.validators = data.validators || emptyArray;
+        return {
+            id: id,
+            type: type,
+            data: data
+        };
+    }
+    function createFormInput(id, data, type) {
+        if (type === void 0) { type = "text"; }
+        var control = createFormControl(id, "input", data);
+        data = control.data;
+        data.type = data.type || type;
+        data.classes = !data.classes ? "form-group-" + data.type : data.classes + " form-group-" + data.type;
+        data.placeholder = data.placeholder || "";
+        data.step = data.step || 1;
+        return control;
+    }
+    function createFormSelect(id, data) {
+        var control = createFormControl(id, "select", data);
+        data = control.data;
+        data.options = data.options || (function () { return Promise.resolve([]); });
+        data.type = data.type || "select";
+        var classType = data.type == "select" ? "select" : "select-" + data.type;
+        data.classes = !data.classes ? "form-group-" + classType : data.classes + " form-group-" + classType;
+        return control;
+    }
+    function createFormStatic(id, data) {
+        var control = createFormControl(id, "static", data);
+        data = control.data;
+        data.style = data.style || "table";
+        return control;
+    }
+    function createFormModel(id, data) {
+        var control = createFormControl(id, "model", data);
+        data = control.data;
+        data.name = data.name || "";
+        return control;
+    }
+    function createFormFile(id, data) {
+        var control = createFormControl(id, "file", data);
+        data = control.data;
+        data.accept = data.accept || ".jpg,.jpeg,.png";
+        data.multi = data.multi || false;
+        data.baseUrl = ngxUtils.ObjectUtils.isString(data.baseUrl) ? data.baseUrl : "assets/";
+        data.uploadUrl = ngxUtils.ObjectUtils.isString(data.uploadUrl) ? data.uploadUrl : "assets";
+        data.createUploadData = data.createUploadData || (function (file) {
+            var form = new FormData();
+            form.append("file", file);
+            return form;
+        });
+        return control;
+    }
+
+    var DynamicFormService = /** @class */ (function () {
+        function DynamicFormService(components, groupType, resolver, injector) {
+            this.components = components;
+            this.groupType = groupType;
+            this.resolver = resolver;
+            this.injector = injector;
+        }
+        DynamicFormService.prototype.findProvider = function (control) {
+            if (!control)
+                return null;
+            var providers = this.components.filter(function (p) { return p.acceptor(control); });
+            if (providers.length == 0) {
+                throw new Error("No component provider for control: " + JSON.stringify({
+                    id: control.id,
+                    type: control.type,
+                    data: control.data
+                }));
+            }
+            // Sort providers
+            providers.sort(function (a, b) { return ngxUtils.ObjectUtils.compare(a.priority, b.priority); });
+            return providers[0];
+        };
+        DynamicFormService.prototype.createComponent = function (vcr, provider) {
+            vcr.clear();
+            if (!provider)
+                return null;
+            var factory = this.resolver.resolveComponentFactory(provider.component);
+            return vcr.createComponent(factory).instance;
+        };
+        DynamicFormService.prototype.createGroup = function (vcr) {
+            vcr.clear();
+            var factory = this.resolver.resolveComponentFactory(this.groupType);
+            return vcr.createComponent(factory).instance;
+        };
+        return DynamicFormService;
+    }());
+    DynamicFormService.decorators = [
+        { type: core.Injectable }
+    ];
+    DynamicFormService.ctorParameters = function () { return [
+        { type: Array, decorators: [{ type: core.Inject, args: [FORM_CONTROL_PROVIDER,] }] },
+        { type: core.Type, decorators: [{ type: core.Inject, args: [FORM_GROUP_TYPE,] }] },
+        { type: core.ComponentFactoryResolver },
+        { type: core.Injector }
+    ]; };
+
+    var FormUtilities = /** @class */ (function () {
+        function FormUtilities() {
+        }
+        FormUtilities.checkField = function (expression) {
+            if (expression === void 0) { expression = "true"; }
+            // @dynamic
+            var lambda = function (control) {
+                return Promise.resolve(ngxUtils.ObjectUtils.evaluate(expression, { control: control }));
+            };
+            return lambda;
+        };
+        FormUtilities.checkReadonly = function (control) {
+            return Promise.resolve(control.visible && !control.disabled);
+        };
+        FormUtilities.readonly = function () {
+            return Promise.resolve(true);
+        };
+        FormUtilities.validateJSON = function (control) {
+            var value = control.value;
+            if (!value)
+                return Promise.resolve(null);
+            try {
+                JSON.parse(value);
+                return Promise.resolve(null);
+            }
+            catch (e) {
+                return Promise.resolve("error.not-valid-json");
+            }
+        };
+        FormUtilities.validateRequired = function (control) {
+            var value = control.value;
+            return Promise.resolve(!ngxUtils.ObjectUtils.isNumber(value) && !value ? "error.required" : null);
+        };
+        FormUtilities.validateMinLength = function (length) {
+            // @dynamic
+            var lambda = function (control) {
+                var value = control.value;
+                if (!ngxUtils.ObjectUtils.isString(value) || value.length < length) {
+                    return Promise.resolve({ "error.min-length": { length: length } });
+                }
+                return Promise.resolve(null);
+            };
+            return lambda;
+        };
+        FormUtilities.validateMaxLength = function (length) {
+            // @dynamic
+            var lambda = function (control) {
+                var value = control.value;
+                if (!ngxUtils.ObjectUtils.isString(value) || value.length > length) {
+                    return Promise.resolve({ "error.max-length": { length: length } });
+                }
+                return Promise.resolve(null);
+            };
+            return lambda;
+        };
+        FormUtilities.validateRequiredTranslation = function (control) {
+            var value = control.value;
+            if (!value || value.length == 0)
+                return Promise.resolve("error.required");
+            return Promise.resolve(value.findIndex(function (t) { return (t.lang == "de" || t.lang == "en") && !t.translation; }) < 0 ? null : "error.required");
+        };
+        FormUtilities.validateEmail = function (control) {
+            var value = control.value;
+            if (!value)
+                return Promise.resolve(null);
+            var emailRegexp = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+            return Promise.resolve(emailRegexp.test(value) ? null : "error.invalid-email");
         };
-        DynamicFormService.prototype.getFormCheckboxConfig = function (property, schema) {
-            return Object.assign(this.getFormControlConfig(property, schema), {
-                indeterminate: property.indeterminate === true
-            });
+        FormUtilities.validatePhone = function (control) {
+            var value = control.value;
+            if (!value)
+                return Promise.resolve(null);
+            var phoneRegexp = /^(?:\d){10,12}$/;
+            return Promise.resolve(phoneRegexp.test(value) ? null : "error.invalid-phone");
+        };
+        FormUtilities.serializeLogo = function (id, parent) {
+            var value = parent.model[id];
+            return Promise.resolve(!value || value.length == 0 ? null : value);
+        };
+        FormUtilities.serializeFile = function (id, parent) {
+            var value = parent.model[id];
+            if (ngxUtils.ObjectUtils.isBlob(value))
+                return Promise.resolve(value);
+            return Promise.resolve(!ngxUtils.ObjectUtils.isString(value) || !value.startsWith("data:") ? null : ngxUtils.FileUtils.dataToBlob(value));
+        };
+        FormUtilities.serializeNumber = function (id, parent) {
+            var value = parent.model[id];
+            return Promise.resolve(!value || value.length == 0 ? 0 : parseFloat(value));
+        };
+        FormUtilities.serializeJSON = function (id, parent) {
+            var value = parent.model[id];
+            return Promise.resolve(!value ? {} : JSON.parse(value));
+        };
+        FormUtilities.serializeDate = function (date, format, defaultValue) {
+            if (format === void 0) { format = "yyyy-MM-dd"; }
+            if (defaultValue === void 0) { defaultValue = ""; }
+            // @dynamic
+            var lambda = function (id, parent) {
+                var value = parent.model[id];
+                if (!ngxUtils.ObjectUtils.isDate(value))
+                    return Promise.resolve(value || defaultValue);
+                return Promise.resolve(!format ? value : date.transform(value, format));
+            };
+            return lambda;
         };
-        DynamicFormService.prototype.translateOptions = function (options) {
-            return __awaiter(this, void 0, void 0, function () {
-                var options_1, options_1_1, option, _c, e_2_1;
-                var e_2, _d;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
-                        case 0:
-                            if (!options)
-                                return [2 /*return*/, []];
-                            _e.label = 1;
-                        case 1:
-                            _e.trys.push([1, 6, 7, 8]);
-                            options_1 = __values(options), options_1_1 = options_1.next();
-                            _e.label = 2;
-                        case 2:
-                            if (!!options_1_1.done) return [3 /*break*/, 5];
-                            option = options_1_1.value;
-                            _c = option;
-                            return [4 /*yield*/, this.language.getTranslation(option.label)];
-                        case 3:
-                            _c.label = _e.sent();
-                            _e.label = 4;
-                        case 4:
-                            options_1_1 = options_1.next();
-                            return [3 /*break*/, 2];
-                        case 5: return [3 /*break*/, 8];
-                        case 6:
-                            e_2_1 = _e.sent();
-                            e_2 = { error: e_2_1 };
-                            return [3 /*break*/, 8];
-                        case 7:
-                            try {
-                                if (options_1_1 && !options_1_1.done && (_d = options_1.return)) _d.call(options_1);
-                            }
-                            finally { if (e_2) throw e_2.error; }
-                            return [7 /*endfinally*/];
-                        case 8: return [2 /*return*/, options];
-                    }
+        return FormUtilities;
+    }());
+    __decorate([
+        ngxUtils.FactoryDependencies(common.DatePipe)
+    ], FormUtilities, "serializeDate", null);
+
+    var OpenApiService = /** @class */ (function () {
+        function OpenApiService(api) {
+            var _this = this;
+            this.api = api;
+            var baseUrl = this.api.url("").replace("api/", "api-docs");
+            this.schemas = {};
+            this.schemasPromise = new Promise((function (resolve) {
+                _this.api.client.get(baseUrl).subscribe(function (res) {
+                    _this.schemas = res.definitions || {};
+                    resolve(_this.schemas);
+                }, function () {
+                    resolve({});
                 });
+            }));
+        }
+        OpenApiService.prototype.getFormInputsForSchema = function (name) {
+            var _this = this;
+            this.api.cache = {};
+            return this.schemasPromise.then(function (schemas) {
+                var schema = schemas[name];
+                var inputs = _this.getFormInputsForSchemaDef(schema);
+                return inputs;
             });
         };
-        DynamicFormService.prototype.getFormSelectOptions = function (property, schema) {
+        OpenApiService.prototype.getFormInputsForSchemaDef = function (schema) {
             var _this = this;
-            var _a;
-            var $enum = ((_a = property.items) === null || _a === void 0 ? void 0 : _a.enum) || property.enum;
-            if (Array.isArray($enum)) {
-                return new FormSelectSubject(function () {
-                    var options = $enum.map(function (value) {
-                        var label = property.translatable ? property.id + "." + value : "" + value;
-                        return { value: value, label: label };
-                    });
-                    return _this.translateOptions(options);
-                });
+            var inputs = {};
+            if (!schema)
+                return inputs;
+            inputs.schema = schema;
+            inputs.serializers = {};
+            inputs.controls = Object.keys(schema.properties || {}).map(function (p) {
+                var property = schema.properties[p];
+                property.id = p;
+                inputs.serializers[p] = function (id, parent) {
+                    return Promise.resolve(parent.model[id]);
+                };
+                return _this.getFormControlForProperty(property, schema);
+            }).filter(function (t) { return null !== t; });
+            return inputs;
+        };
+        OpenApiService.prototype.getFormControlForProperty = function (property, schema) {
+            if (Array.isArray(property.enum)) {
+                return createFormSelect(property.id, this.getFormSelectData(property, schema));
             }
-            if (isStringWithVal(property.optionsPath)) {
-                return new FormSelectSubject(function (formModel, control, root, indexes) {
-                    var path = property.optionsPath;
-                    var target = control;
-                    var model = formModel;
-                    if (path.startsWith("$root")) {
-                        path = path.substr(5);
-                        while (target.parent) {
-                            target = target.parent;
-                        }
-                        model = root;
-                    }
-                    while (path.startsWith(".")) {
-                        path = path.substr(1);
-                        if (target.parent) {
-                            target = target.parent;
-                        }
-                        model = model.parent || root;
-                    }
-                    Object.keys(indexes).forEach(function (key) {
-                        path = path.replace(key, indexes[key]);
-                    });
-                    model = _this.findModelByPath(model, path.split("."));
-                    var modelOptions = (model instanceof core.DynamicSelectModel ? model.options : []);
-                    var value = ngxUtils.ObjectUtils.getValue(target.value, path);
-                    var options = (!ngxUtils.ObjectUtils.isArray(value) ? [] : value).map(function (value) {
-                        var modelOption = modelOptions.find(function (t) { return t.value == value; });
-                        return { value: value, label: (modelOption === null || modelOption === void 0 ? void 0 : modelOption.label) || value };
-                    });
-                    return _this.translateOptions(options);
-                });
+            switch (property.type) {
+                case "string":
+                case "number":
+                case "boolean":
+                case "textarea":
+                    return createFormInput(property.id, this.getFormInputData(property, schema));
+                case "list":
+                    return createFormSelect(property.id, this.getFormSelectData(property, schema));
+                case "file":
+                    return createFormFile(property.id, this.getFormFileData(property, schema));
             }
-            return new FormSelectSubject(function () { return __awaiter(_this, void 0, void 0, function () {
-                var options;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            this.api.cache[property.endpoint] = this.api.cache[property.endpoint] || this.api.list(property.endpoint, this.api.makeListParams(1, -1)).then(function (result) {
-                                return result.items.map(function (i) {
-                                    return { value: i.id || i._id, label: i[property.labelField] || i.label || i.id || i._id };
-                                });
-                            });
-                            return [4 /*yield*/, this.api.cache[property.endpoint]];
-                        case 1:
-                            options = (_c.sent()).map(function (t) { return Object.assign({}, t); });
-                            return [2 /*return*/, this.translateOptions(options)];
-                    }
-                });
-            }); });
-        };
-        DynamicFormService.prototype.getFormUploadConfig = function (property, schema) {
-            var url = this.api.url(property.url || "assets");
-            var accept = property.accept, autoUpload = property.autoUpload, maxSize = property.maxSize, minSize = property.minSize, removeUrl = property.removeUrl, showFileList = property.showFileList;
-            return Object.assign(this.getFormControlConfig(property, schema), {
-                url: url,
-                accept: accept,
-                autoUpload: autoUpload,
-                maxSize: maxSize,
-                minSize: minSize,
-                removeUrl: removeUrl,
-                showFileList: showFileList
-            });
+            return null;
         };
-        DynamicFormService.prototype.getValidators = function (property, schema) {
-            var validators = {};
-            if (ngxUtils.ObjectUtils.isArray(schema.required) && schema.required.indexOf(property.id) >= 0) {
-                validators.required = null;
-            }
-            this.addPropertyValidators(validators, property);
-            this.addItemsValidators(validators, property.items);
-            return validators;
+        OpenApiService.prototype.getBaseFormData = function (property, schema) {
+            return {
+                readonly: property.readonly ? FormUtilities.readonly : null,
+                shouldSerialize: FormUtilities.checkReadonly,
+                validators: this.getValidators(property, schema)
+            };
         };
-        DynamicFormService.prototype.addPropertyValidators = function (validators, property) {
-            if (!property)
-                return;
-            if (!isNaN(property.minLength)) {
-                validators.minLength = property.minLength;
+        OpenApiService.prototype.getFormInputData = function (property, schema) {
+            var type = ngxUtils.StringUtils.has(property.id, "password", "Password") ? "password" : property.type;
+            switch (property.type) {
+                case "boolean":
+                    type = "checkbox";
+                    break;
+                case "textarea":
+                    type = "textarea";
+                    break;
             }
-            if (!isNaN(property.maxLength)) {
-                validators.maxLength = property.maxLength;
+            return Object.assign(Object.assign({}, this.getBaseFormData(property, schema)), { type: type });
+        };
+        OpenApiService.prototype.getFormSelectData = function (property, schema) {
+            var _this = this;
+            var options = Array.isArray(property.enum)
+                ? function () {
+                    return Promise.resolve(property.enum.map(function (id) { return ({ id: id, label: property.id + "." + id }); }));
+                }
+                : function () {
+                    _this.api.cache[property.endpoint] = _this.api.cache[property.endpoint] || _this.api.list(property.endpoint, _this.api.makeListParams(1, -1)).then(function (result) {
+                        return result.items.map(function (i) {
+                            return { id: i._id, label: i.name };
+                        });
+                    });
+                    return _this.api.cache[property.endpoint];
+                };
+            return Object.assign(Object.assign({}, this.getBaseFormData(property, schema)), { options: options });
+        };
+        OpenApiService.prototype.getFormFileData = function (property, schema) {
+            return Object.assign(Object.assign({}, this.getBaseFormData(property, schema)), { multi: property.multi });
+        };
+        OpenApiService.prototype.getValidators = function (property, schema) {
+            var validators = [];
+            if (schema.required.indexOf(property.id) >= 0) {
+                validators.push(FormUtilities.validateRequired);
             }
-            if (!isNaN(property.minimum)) {
-                validators.min = property.minimum;
+            if (property.minLength) {
+                validators.push({
+                    type: FormUtilities,
+                    func: FormUtilities.validateMinLength,
+                    params: [property.minLength]
+                });
             }
-            if (!isNaN(property.maximum)) {
-                validators.max = property.maximum;
+            if (property.maxLength) {
+                validators.push({
+                    type: FormUtilities,
+                    func: FormUtilities.validateMaxLength,
+                    params: [property.maxLength]
+                });
             }
             switch (property.format) {
                 case "email":
-                    validators.email = null;
+                    validators.push(FormUtilities.validateEmail);
                     break;
             }
+            return validators;
         };
-        DynamicFormService.prototype.addItemsValidators = function (validators, items) {
-            if (!items)
-                return;
-            if (!isNaN(items.minLength)) {
-                validators.itemsMinLength = items.minLength;
-            }
-            if (!isNaN(items.maxLength)) {
-                validators.itemsMaxLength = items.maxLength;
-            }
-            if (!isNaN(items.minimum)) {
-                validators.itemsMinValue = items.minimum;
-            }
-            if (!isNaN(items.maximum)) {
-                validators.itemsMaxValue = items.maximum;
-            }
-        };
-        return DynamicFormService;
-    }(core.DynamicFormService));
-    DynamicFormService.decorators = [
-        { type: core$1.Injectable }
+        return OpenApiService;
+    }());
+    OpenApiService.decorators = [
+        { type: core.Injectable }
     ];
-    DynamicFormService.ctorParameters = function () { return [
-        { type: core.DynamicFormComponentService },
-        { type: core.DynamicFormValidationService },
-        { type: ngxUtils.OpenApiService, decorators: [{ type: core$1.Inject, args: [ngxUtils.OpenApiService,] }] },
-        { type: core$1.Injector, decorators: [{ type: core$1.Inject, args: [core$1.Injector,] }] }
+    OpenApiService.ctorParameters = function () { return [
+        { type: ngxUtils.ApiService }
     ]; };
 
     var AsyncSubmitDirective = /** @class */ (function () {
         function AsyncSubmitDirective(toaster, cdr, elem, renderer) {
             this.toaster = toaster;
             this.cdr = cdr;
-            this.elem = elem;
-            this.renderer = renderer;
-            this.onSuccess = new core$1.EventEmitter();
-            this.onError = new core$1.EventEmitter();
+            this.onSuccess = new core.EventEmitter();
+            this.onError = new core.EventEmitter();
             if (elem.nativeElement.tagName !== "BUTTON")
                 return;
             renderer.setAttribute(elem.nativeElement, "type", "button");
@@ -1152,14 +1377,6 @@
             get: function () {
                 return this.disabled;
             },
-            set: function (value) {
-                this.disabled = value;
-                if (value) {
-                    this.renderer.setAttribute(this.elem.nativeElement, "disabled", "disabled");
-                    return;
-                }
-                this.renderer.removeAttribute(this.elem.nativeElement, "disabled");
-            },
             enumerable: false,
             configurable: true
         });
@@ -1174,12 +1391,12 @@
             var _this = this;
             if (!this.form)
                 return;
-            this.isDisabled = this.form.status !== "VALID";
+            this.disabled = this.form.status !== "VALID";
             this.cdr.detectChanges();
-            this.onStatusChange = this.form.onStatusChange.subscribe(function () {
-                _this.isDisabled = _this.form.status !== "VALID";
+            this.onStatusChange = this.form.onStatusChange.subscribe(function (form) {
+                _this.disabled = form.status !== "VALID";
                 _this.cdr.detectChanges();
-                if (!_this.callback || _this.form.status == "PENDING")
+                if (!_this.callback || form.status == "PENDING")
                     return;
                 if (!_this.disabled) {
                     _this.callback();
@@ -1207,7 +1424,7 @@
             if (this.loading)
                 return;
             this.loading = true;
-            this.method(this.form, this.context).then(function (result) {
+            this.method(this.form).then(function (result) {
                 _this.loading = false;
                 if (result) {
                     _this.onSuccess.emit(result);
@@ -1224,120 +1441,231 @@
         return AsyncSubmitDirective;
     }());
     AsyncSubmitDirective.decorators = [
-        { type: core$1.Directive, args: [{
+        { type: core.Directive, args: [{
                     selector: "[async-submit]",
                     exportAs: "async-submit"
                 },] }
     ];
     AsyncSubmitDirective.ctorParameters = function () { return [
-        { type: undefined, decorators: [{ type: core$1.Inject, args: [ngxUtils.TOASTER_SERVICE,] }] },
-        { type: core$1.ChangeDetectorRef },
-        { type: core$1.ElementRef },
-        { type: core$1.Renderer2 }
+        { type: undefined, decorators: [{ type: core.Inject, args: [ngxUtils.TOASTER_SERVICE,] }] },
+        { type: core.ChangeDetectorRef },
+        { type: core.ElementRef },
+        { type: core.Renderer2 }
     ]; };
     AsyncSubmitDirective.propDecorators = {
-        method: [{ type: core$1.Input, args: ["async-submit",] }],
-        form: [{ type: core$1.Input }],
-        context: [{ type: core$1.Input }],
-        onSuccess: [{ type: core$1.Output }],
-        onError: [{ type: core$1.Output }],
-        isDisabled: [{ type: core$1.HostBinding, args: ["class.disabled",] }],
-        isLoading: [{ type: core$1.HostBinding, args: ["class.loading",] }],
-        click: [{ type: core$1.HostListener, args: ["click",] }]
+        method: [{ type: core.Input, args: ["async-submit",] }],
+        form: [{ type: core.Input }],
+        onSuccess: [{ type: core.Output }],
+        onError: [{ type: core.Output }],
+        isDisabled: [{ type: core.HostBinding, args: ["class.disabled",] }],
+        isLoading: [{ type: core.HostBinding, args: ["class.loading",] }],
+        click: [{ type: core.HostListener, args: ["click",] }]
     };
 
-    var DynamicBaseFormComponent = /** @class */ (function (_super) {
-        __extends(DynamicBaseFormComponent, _super);
-        function DynamicBaseFormComponent(formService, events, changeDetectorRef, componentService) {
-            var _this = _super.call(this, changeDetectorRef, componentService) || this;
-            _this.formService = formService;
-            _this.events = events;
-            _this.blur = new core$1.EventEmitter();
-            _this.change = new core$1.EventEmitter();
-            _this.focus = new core$1.EventEmitter();
-            _this.onValueChange = new core$1.EventEmitter();
-            _this.onStatusChange = new core$1.EventEmitter();
-            _this.onSubmit = new core$1.EventEmitter();
-            _this.templates = new core$1.QueryList();
-            _this.subscription = new rxjs.Subscription();
-            _this.groupSubscription = new rxjs.Subscription();
-            _this.labelPrefix = "label";
-            return _this;
+    var DynamicFormControlDirective = /** @class */ (function () {
+        function DynamicFormControlDirective(vcr, forms) {
+            this.vcr = vcr;
+            this.forms = forms;
         }
-        Object.defineProperty(DynamicBaseFormComponent.prototype, "status", {
+        Object.defineProperty(DynamicFormControlDirective.prototype, "component", {
             get: function () {
-                return !this.group ? null : this.group.status;
+                return this.comp;
             },
             enumerable: false,
             configurable: true
         });
-        DynamicBaseFormComponent.prototype.ngOnChanges = function (changes) {
-            var _this = this;
-            this.groupSubscription.unsubscribe();
-            if (this.group) {
-                this.groupSubscription = ngxUtils.ObservableUtils.multiSubscription(this.group.statusChanges.subscribe(function () {
-                    _this.onStatusChange.emit(_this);
-                }), this.group.valueChanges.subscribe(function () {
-                    _this.formService.notifyChanges(_this.model, _this.group, _this.model);
-                }), this.change.subscribe(function (ev) {
-                    _this.onValueChange.emit(Object.assign(Object.assign({}, ev), { form: _this }));
-                }));
+        DynamicFormControlDirective.prototype.ngOnChanges = function (changes) {
+            if (changes.control) {
+                this.comp = this.forms.createComponent(this.vcr, this.control.provider);
             }
+            if (!this.comp)
+                return;
+            this.comp.control = this.control;
         };
-        DynamicBaseFormComponent.prototype.ngAfterViewInit = function () {
-            var _this = this;
-            this.subscription = ngxUtils.ObservableUtils.multiSubscription(ngxUtils.ObservableUtils.subscribe({
-                subjects: [this.contentTemplates.changes, this.viewTemplates.changes],
-                cb: function () {
-                    var templates = _this.contentTemplates.toArray().concat(_this.viewTemplates.toArray());
-                    _this.templates.reset(templates);
+        return DynamicFormControlDirective;
+    }());
+    DynamicFormControlDirective.decorators = [
+        { type: core.Directive, args: [{
+                    selector: "[form-control]",
+                },] }
+    ];
+    DynamicFormControlDirective.ctorParameters = function () { return [
+        { type: core.ViewContainerRef },
+        { type: DynamicFormService }
+    ]; };
+    DynamicFormControlDirective.propDecorators = {
+        control: [{ type: core.Input, args: ["form-control",] }]
+    };
+
+    var DynamicFormTemplateDirective = /** @class */ (function () {
+        function DynamicFormTemplateDirective(template) {
+            this.template = template;
+        }
+        return DynamicFormTemplateDirective;
+    }());
+    DynamicFormTemplateDirective.decorators = [
+        { type: core.Directive, args: [{
+                    selector: "ng-template[control],\n                ng-template[label],\n                ng-template[input],\n                ng-template[prefix],\n                ng-template[suffix],\n                ng-template[setPrefix],\n                ng-template[setSuffix],\n                ng-template[formPrefix],\n                ng-template[formSuffix],\n                ng-template[innerFormPrefix],\n                ng-template[innerFormSuffix]"
+                },] }
+    ];
+    DynamicFormTemplateDirective.ctorParameters = function () { return [
+        { type: core.TemplateRef }
+    ]; };
+    DynamicFormTemplateDirective.propDecorators = {
+        control: [{ type: core.Input }],
+        label: [{ type: core.Input }],
+        input: [{ type: core.Input }],
+        prefix: [{ type: core.Input }],
+        suffix: [{ type: core.Input }],
+        setPrefix: [{ type: core.Input }],
+        setSuffix: [{ type: core.Input }],
+        formPrefix: [{ type: core.Input }],
+        formSuffix: [{ type: core.Input }],
+        innerFormPrefix: [{ type: core.Input }],
+        innerFormSuffix: [{ type: core.Input }]
+    };
+
+    var DynamicFormBaseComponent = /** @class */ (function () {
+        function DynamicFormBaseComponent(cdr, formService) {
+            this.formService = formService;
+            this.name = "";
+            this.testId = "form";
+            this.controlTemplates = {};
+            this.labelTemplates = {};
+            this.inputTemplates = {};
+            this.prefixTemplates = {};
+            this.suffixTemplates = {};
+            this.onChange = new core.EventEmitter();
+            this.onStatusChange = new core.EventEmitter();
+            this.onInit = new core.EventEmitter();
+            this.onSubmit = new core.EventEmitter();
+            this.injector = formService.injector;
+            this.cdr = cdr;
+        }
+        Object.defineProperty(DynamicFormBaseComponent.prototype, "root", {
+            get: function () {
+                var form = this;
+                while (ngxUtils.ObjectUtils.isDefined(form.parent)) {
+                    form = form.parent;
                 }
-            }), this.events.languageChanged.subscribe(function () {
-                _this.formService.detectChanges(_this);
-            }), this.ngForm.ngSubmit.subscribe(function () {
-                _this.onSubmit.emit(_this);
-            }));
+                return form;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DynamicFormBaseComponent.prototype.findProvider = function (control) {
+            return this.formService.findProvider(control);
+        };
+        // --- Lifecycle hooks
+        DynamicFormBaseComponent.prototype.ngAfterContentInit = function () {
+            this.wrapperTemplate = this.wrapperTemplate || this.cWrapperTemplate;
+            this.fieldSetTemplate = this.fieldSetTemplate || this.cFieldSetTemplate;
+            this.controlTemplate = this.controlTemplate || this.cControlTemplate;
+            this.controlTemplates = this.filterTemplates(this.controlTemplates, "control");
+            this.labelTemplates = this.filterTemplates(this.labelTemplates, "label");
+            this.inputTemplates = this.filterTemplates(this.inputTemplates, "input");
+            this.prefixTemplates = this.filterTemplates(this.prefixTemplates, "prefix");
+            this.suffixTemplates = this.filterTemplates(this.suffixTemplates, "suffix");
+            this.setPrefixTemplates = this.filterTemplates(this.setPrefixTemplates, "setPrefix");
+            this.setSuffixTemplates = this.filterTemplates(this.setSuffixTemplates, "setSuffix");
+        };
+        DynamicFormBaseComponent.prototype.filterTemplates = function (templates, type) {
+            if (ngxUtils.ObjectUtils.isObject(templates) && Object.keys(templates).length > 0)
+                return templates;
+            return this.templates.filter(function (t) { return !!t[type]; }).reduce(function (result, directive) {
+                result[directive[type]] = directive.template;
+                return result;
+            }, {});
         };
-        DynamicBaseFormComponent.prototype.ngOnDestroy = function () {
-            _super.prototype.ngOnDestroy.call(this);
-            this.subscription.unsubscribe();
-            this.groupSubscription.unsubscribe();
-        };
-        DynamicBaseFormComponent.prototype.insertFormArrayGroup = function (index, formArray, formArrayModel) {
-            this.formService.insertFormArrayGroup(index, formArray, formArrayModel);
-            this.changeDetectorRef.detectChanges();
-        };
-        DynamicBaseFormComponent.prototype.removeFormArrayGroup = function (index, formArray, formArrayModel) {
-            this.formService.removeFormArrayGroup(index, formArray, formArrayModel);
-            this.changeDetectorRef.detectChanges();
-        };
-        DynamicBaseFormComponent.prototype.moveFormArrayGroup = function (index, step, formArray, formArrayModel) {
-            this.formService.moveFormArrayGroup(index, step, formArray, formArrayModel);
-            this.changeDetectorRef.detectChanges();
-        };
-        DynamicBaseFormComponent.prototype.clearFormArray = function (formArray, formArrayModel) {
-            this.formService.clearFormArray(formArray, formArrayModel);
-            this.changeDetectorRef.detectChanges();
-        };
-        DynamicBaseFormComponent.prototype.getClass = function (model) {
-            var parts = collectPathAble(model, function (p) { return p.id; });
-            if (parts.length == 0)
-                return "";
-            if (model instanceof core.DynamicFormGroupModel) {
-                return "form-group-" + parts.join("-");
+        return DynamicFormBaseComponent;
+    }());
+    DynamicFormBaseComponent.decorators = [
+        { type: core.Directive }
+    ];
+    DynamicFormBaseComponent.ctorParameters = function () { return [
+        { type: core.ChangeDetectorRef },
+        { type: DynamicFormService }
+    ]; };
+    DynamicFormBaseComponent.propDecorators = {
+        name: [{ type: core.Input }],
+        testId: [{ type: core.Input }],
+        readonly: [{ type: core.Input }],
+        updateOn: [{ type: core.Input }],
+        classes: [{ type: core.Input }],
+        parent: [{ type: core.Input }],
+        wrapperTemplate: [{ type: core.Input }],
+        fieldSetTemplate: [{ type: core.Input }],
+        controlTemplate: [{ type: core.Input }],
+        controlTemplates: [{ type: core.Input }],
+        labelTemplates: [{ type: core.Input }],
+        inputTemplates: [{ type: core.Input }],
+        prefixTemplates: [{ type: core.Input }],
+        suffixTemplates: [{ type: core.Input }],
+        setPrefixTemplates: [{ type: core.Input }],
+        setSuffixTemplates: [{ type: core.Input }],
+        onChange: [{ type: core.Output }],
+        onStatusChange: [{ type: core.Output }],
+        onInit: [{ type: core.Output }],
+        onSubmit: [{ type: core.Output }],
+        prefixTemplate: [{ type: core.ContentChild, args: ["prefixTemplate",] }],
+        suffixTemplate: [{ type: core.ContentChild, args: ["suffixTemplate",] }],
+        templates: [{ type: core.ContentChildren, args: [DynamicFormTemplateDirective,] }],
+        cWrapperTemplate: [{ type: core.ContentChild, args: ["wrapperTemplate",] }],
+        cFieldSetTemplate: [{ type: core.ContentChild, args: ["fieldSetTemplate",] }],
+        cControlTemplate: [{ type: core.ContentChild, args: ["controlTemplate",] }]
+    };
+
+    var DynamicFormComponent = /** @class */ (function (_super) {
+        __extends(DynamicFormComponent, _super);
+        function DynamicFormComponent(cdr, forms) {
+            var _this = _super.call(this, cdr, forms) || this;
+            _this.group = new DynamicFormGroup(_this);
+            _this.defaultFieldSet = {
+                id: "",
+                title: "",
+                classes: ""
+            };
+            return _this;
+        }
+        Object.defineProperty(DynamicFormComponent.prototype, "status", {
+            get: function () {
+                return this.group.state;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DynamicFormComponent.prototype, "formControls", {
+            get: function () {
+                return this.group.formControls;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        // --- Lifecycle hooks
+        DynamicFormComponent.prototype.ngOnChanges = function (changes) {
+            if (!this.data)
+                return;
+            if (changes.data || changes.controls || changes.serializers || changes.formGroup) {
+                if (this.group.id)
+                    return;
+                this.group.setup(this.data, this);
+                this.group.reloadControls();
             }
-            return "form-control-" + parts.join("-");
         };
-        DynamicBaseFormComponent.prototype.validate = function (showErrors) {
+        // --- Custom ---
+        DynamicFormComponent.prototype.onFormSubmit = function () {
+            var _this = this;
+            var root = this.root;
+            root.validate().then(function () { return root.onSubmit.emit(_this); }, function () { });
+        };
+        // --- IDynamicForm ---
+        DynamicFormComponent.prototype.validate = function (showErrors) {
             var _this = this;
             if (showErrors === void 0) { showErrors = true; }
-            if (!this.group)
-                return Promise.resolve();
             return new Promise(function (resolve, reject) {
                 _this.group.statusChanges.pipe(operators.first(function (status) { return status == "VALID" || status == "INVALID"; })).subscribe(function (status) {
-                    if (showErrors) {
-                        _this.formService.showErrors(_this);
-                    }
+                    if (showErrors)
+                        _this.group.showErrors();
                     if (status == "VALID") {
                         resolve(null);
                         return;
@@ -1347,384 +1675,628 @@
                 _this.group.updateValueAndValidity();
             });
         };
-        DynamicBaseFormComponent.prototype.serialize = function (validate) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (!this.group)
-                                return [2 /*return*/, null];
-                            if (!validate) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.validate()];
-                        case 1:
-                            _a.sent();
-                            _a.label = 2;
-                        case 2: return [4 /*yield*/, this.formService.serialize(this.model, this.group)];
-                        case 3: return [2 /*return*/, _a.sent()];
-                    }
-                });
+        DynamicFormComponent.prototype.serialize = function (validate) {
+            var _this = this;
+            return new Promise(function (resolve, reject) {
+                var serialize = function () {
+                    _this.group.serialize().then(resolve);
+                };
+                if (validate) {
+                    _this.validate().then(serialize, reject);
+                    return;
+                }
+                serialize();
             });
         };
-        return DynamicBaseFormComponent;
-    }(core.DynamicFormComponent));
-    DynamicBaseFormComponent.decorators = [
-        { type: core$1.Component, args: [{
-                    selector: "dynamic-base-form",
-                    template: "",
-                    changeDetection: core$1.ChangeDetectionStrategy.Default
+        DynamicFormComponent.prototype.check = function () {
+            return this.group.check();
+        };
+        DynamicFormComponent.prototype.getControl = function (id) {
+            return this.group.getControl(id);
+        };
+        return DynamicFormComponent;
+    }(DynamicFormBaseComponent));
+    DynamicFormComponent.decorators = [
+        { type: core.Component, args: [{
+                    moduleId: module.id,
+                    selector: "dynamic-form, [dynamic-form]",
+                    template: "<ng-template #defaultFieldSetTemplate let-id=\"id\" let-controls=\"controls\" let-fieldSet=\"fieldSet\">\r\n    <div [ngClass]=\"['form-fields', 'form-fields-' + id, fieldSet.classes]\">\r\n        <ng-container [ngxTemplateOutlet]=\"setPrefixTemplates[fieldSet.id]\" [context]=\"fieldSet\"></ng-container>\r\n        <div *ngIf=\"fieldSet.title\" [ngClass]=\"['form-title', fieldSet.titleClasses || '']\">\r\n            {{ group.prefix + fieldSet.title | translate }}\r\n        </div>\r\n        <ng-template #subControls>\r\n            <ng-container *ngFor=\"let control of controls\" [form-group]=\"control\" [visible]=\"control.visible\" [form]=\"this\">\r\n\r\n            </ng-container>\r\n        </ng-template>\r\n        <div *ngIf=\"fieldSet.setClasses; else subControls\" [ngClass]=\"fieldSet.setClasses\">\r\n            <div *ngIf=\"fieldSet.controlClasses; else subControls\" [ngClass]=\"fieldSet.controlClasses\">\r\n                <ng-container [ngTemplateOutlet]=\"subControls\"></ng-container>\r\n            </div>\r\n        </div>\r\n        <ng-container [ngxTemplateOutlet]=\"setSuffixTemplates[fieldSet.id]\" [context]=\"fieldSet\"></ng-container>\r\n    </div>\r\n</ng-template>\r\n\r\n<ng-template #fieldSetsTemplate>\r\n    <ng-container *ngFor=\"let fs of formControls | groupBy:'data.fieldSet'\"\r\n                  [ngxTemplateOutlet]=\"fieldSetTemplate || defaultFieldSetTemplate\"\r\n                  [context]=\"{form: this, id: fs.group, controls: fs.items, fieldSet: group.formFields[fs.group] || defaultFieldSet}\">\r\n    </ng-container>\r\n</ng-template>\r\n<ng-template #defaultWrapperTemplate let-form=\"form\" let-fieldSetsTemplate=\"fieldSetsTemplate\">\r\n    <ng-container [ngTemplateOutlet]=\"prefixTemplate\"\r\n                  [ngTemplateOutletContext]=\"{form: form, fieldSetsTemplate: fieldSetsTemplate}\"></ng-container>\r\n    <form class=\"dynamic-form\" [ngClass]=\"form.classes || ''\" [formGroup]=\"group\" (submit)=\"onFormSubmit()\">\r\n        <ng-container [ngTemplateOutlet]=\"fieldSetsTemplate\"></ng-container>\r\n        <ng-content></ng-content>\r\n        <div *ngIf=\"form.status == 'PENDING'\" class=\"dynamic-form-validator\">\r\n            {{ group.prefix + 'message.pending' | translate }}\r\n        </div>\r\n        <button [ngStyle]=\"{display: 'none'}\">Submit</button>\r\n    </form>\r\n    <ng-container [ngTemplateOutlet]=\"suffixTemplate\"\r\n                  [ngTemplateOutletContext]=\"{form: form, fieldSetsTemplate: fieldSetsTemplate}\"></ng-container>\r\n</ng-template>\r\n<ng-template #loadingTemplate>\r\n    <div *ngIf=\"status == 'LOADING'\" class=\"dynamic-form-loader\">\r\n        {{ group.prefix + 'message.loading' | translate }}\r\n    </div>\r\n</ng-template>\r\n<ng-container [ngTemplateOutlet]=\"wrapperTemplate || defaultWrapperTemplate\"\r\n              [ngTemplateOutletContext]=\"{form: this, fieldSetsTemplate: fieldSetsTemplate}\"\r\n              *ngIf=\"status !== 'LOADING'; else loadingTemplate\">\r\n</ng-container>\r\n",
+                    providers: [{ provide: DynamicFormBaseComponent, useExisting: DynamicFormComponent }]
                 },] }
     ];
-    DynamicBaseFormComponent.ctorParameters = function () { return [
-        { type: DynamicFormService, decorators: [{ type: core$1.Inject, args: [DynamicFormService,] }] },
-        { type: ngxUtils.EventsService, decorators: [{ type: core$1.Inject, args: [ngxUtils.EventsService,] }] },
-        { type: core$1.ChangeDetectorRef },
-        { type: core.DynamicFormComponentService }
+    DynamicFormComponent.ctorParameters = function () { return [
+        { type: core.ChangeDetectorRef },
+        { type: DynamicFormService }
     ]; };
-    DynamicBaseFormComponent.propDecorators = {
-        group: [{ type: core$1.Input }],
-        model: [{ type: core$1.Input }],
-        layout: [{ type: core$1.Input }],
-        labelPrefix: [{ type: core$1.Input }],
-        blur: [{ type: core$1.Output }],
-        change: [{ type: core$1.Output }],
-        focus: [{ type: core$1.Output }],
-        contentTemplates: [{ type: core$1.ContentChildren, args: [core.DynamicTemplateDirective,] }],
-        viewTemplates: [{ type: core$1.ViewChildren, args: [core.DynamicTemplateDirective,] }],
-        onValueChange: [{ type: core$1.Output }],
-        onStatusChange: [{ type: core$1.Output }],
-        onSubmit: [{ type: core$1.Output }],
-        ngForm: [{ type: core$1.ViewChild, args: [forms.NgForm,] }]
+    DynamicFormComponent.propDecorators = {
+        group: [{ type: core.Input }],
+        controls: [{ type: core.Input }],
+        serializers: [{ type: core.Input }],
+        fieldSets: [{ type: core.Input }],
+        data: [{ type: core.Input }]
     };
 
-    var DynamicBaseFormArrayComponent = /** @class */ (function (_super) {
-        __extends(DynamicBaseFormArrayComponent, _super);
-        function DynamicBaseFormArrayComponent(layoutService, validationService, injector) {
-            var _this = _super.call(this, layoutService, validationService) || this;
-            _this.layoutService = layoutService;
-            _this.validationService = validationService;
-            _this.injector = injector;
-            _this.blur = new core$1.EventEmitter();
-            _this.change = new core$1.EventEmitter();
-            _this.customEvent = new core$1.EventEmitter();
-            _this.focus = new core$1.EventEmitter();
+    var statusPriority = ["LOADING", "PENDING", "DISABLED", "INVALID"];
+    var DynamicFormsComponent = /** @class */ (function (_super) {
+        __extends(DynamicFormsComponent, _super);
+        function DynamicFormsComponent(cdr, formService) {
+            var _this = _super.call(this, cdr, formService) || this;
+            _this.formPrefixTemplates = {};
+            _this.formSuffixTemplates = {};
+            _this.innerFormPrefixTemplates = {};
+            _this.innerFormSuffixTemplates = {};
             return _this;
         }
-        Object.defineProperty(DynamicBaseFormArrayComponent.prototype, "useTabs", {
+        Object.defineProperty(DynamicFormsComponent.prototype, "status", {
             get: function () {
-                var _a;
-                return (_a = this.model) === null || _a === void 0 ? void 0 : _a.useTabs;
+                var _loop_1 = function (i) {
+                    var status = statusPriority[i];
+                    if (this_1.checkForms(function (f) { return f.status == status; }))
+                        return { value: status };
+                };
+                var this_1 = this;
+                for (var i = 0; i < statusPriority.length; i++) {
+                    var state_1 = _loop_1(i);
+                    if (typeof state_1 === "object")
+                        return state_1.value;
+                }
+                return "VALID";
             },
             enumerable: false,
             configurable: true
         });
-        DynamicBaseFormArrayComponent.prototype.saveTab = function (index) {
-            this.model.saveTab(index, this.model, this.injector);
-        };
-        DynamicBaseFormArrayComponent.prototype.restoreTab = function () {
-            return this.model.restoreTab(this.model, this.injector);
-        };
-        DynamicBaseFormArrayComponent.prototype.getClass = function (context, place, model) {
-            var _a;
-            return [
-                context == "element" ? this.getModelClass(model) : null,
-                context == "element" ? this.getAdditionalClass(model) : null,
-                _super.prototype.getClass.call(this, context, place, model),
-                model instanceof core.DynamicFormValueControlModel ? (_a = model.additional) === null || _a === void 0 ? void 0 : _a.classes : null
-            ].filter(function (cls) { return !!cls; }).join(" ");
-        };
-        DynamicBaseFormArrayComponent.prototype.getModelClass = function (model) {
-            var parts = collectPathAble(model, function (p) { return p.id; });
-            if (parts.length == 0)
-                return "";
-            if (model instanceof core.DynamicFormGroupModel) {
-                return "form-group-" + parts.join("-");
-            }
-            return "form-control-" + parts.join("-");
+        // --- Lifecycle hooks
+        DynamicFormsComponent.prototype.ngAfterContentInit = function () {
+            _super.prototype.ngAfterContentInit.call(this);
+            this.containerTemplate = this.containerTemplate || this.cContainerTemplate;
+            this.formPrefixTemplates = this.filterTemplates(this.formPrefixTemplates, "formPrefix");
+            this.formSuffixTemplates = this.filterTemplates(this.formSuffixTemplates, "formSuffix");
+            this.innerFormPrefixTemplates = this.filterTemplates(this.innerFormPrefixTemplates, "innerFormPrefix");
+            this.innerFormSuffixTemplates = this.filterTemplates(this.innerFormSuffixTemplates, "innerFormSuffix");
+        };
+        DynamicFormsComponent.prototype.ngOnChanges = function (changes) {
+            this.configs = this.createFormGroups(this.data);
+        };
+        // --- IDynamicFormBase ---
+        DynamicFormsComponent.prototype.validate = function (showErrors) {
+            if (showErrors === void 0) { showErrors = true; }
+            if (!this.forms)
+                return Promise.reject(null);
+            return Promise.all(this.forms.map(function (f) { return f.validate(showErrors); }));
         };
-        DynamicBaseFormArrayComponent.prototype.getAdditionalClass = function (model) {
-            var _a, _b;
-            if (model instanceof DynamicFormArrayModel) {
-                return (_a = model.additional) === null || _a === void 0 ? void 0 : _a.classes;
-            }
-            if (model instanceof core.DynamicFormValueControlModel) {
-                return (_b = model.additional) === null || _b === void 0 ? void 0 : _b.classes;
-            }
-            return null;
+        DynamicFormsComponent.prototype.serialize = function (validate) {
+            var _this = this;
+            if (!this.forms)
+                return validate ? Promise.reject(null) : Promise.resolve({});
+            return new Promise(function (resolve, reject) {
+                var promises = _this.forms.map(function (f) { return f.serialize(validate); });
+                Promise.all(promises).then(function (results) {
+                    var result = {};
+                    results.forEach(function (data, ix) {
+                        var config = _this.data[ix];
+                        var path = null;
+                        if (ngxUtils.ObjectUtils.isArray(config.path) && config.path.length > 0) {
+                            path = config.path;
+                        }
+                        else if (ngxUtils.ObjectUtils.isString(config.path) && config.path.length > 0) {
+                            path = config.path.split(".");
+                        }
+                        else if (ngxUtils.ObjectUtils.isNumber(config.path)) {
+                            path = [config.path];
+                        }
+                        if (!path) {
+                            result = ngxUtils.ObjectUtils.assign(result, data);
+                            return;
+                        }
+                        result = ngxUtils.ObjectUtils.mapToPath(result, data, path.map(function (p) { return "" + p; }));
+                    });
+                    resolve(result);
+                }, reject);
+            });
         };
-        return DynamicBaseFormArrayComponent;
-    }(core.DynamicFormArrayComponent));
-    DynamicBaseFormArrayComponent.decorators = [
-        { type: core$1.Component, args: [{
-                    selector: "dynamic-base-form-array",
-                    template: "",
-                    changeDetection: core$1.ChangeDetectionStrategy.OnPush
+        DynamicFormsComponent.prototype.check = function () {
+            if (!this.forms)
+                return Promise.resolve(null);
+            return Promise.all(this.forms.map(function (t) { return t.check(); }));
+        };
+        DynamicFormsComponent.prototype.getControl = function (id) {
+            return this.getFromValue(function (f) { return f.getControl(id); });
+        };
+        DynamicFormsComponent.prototype.checkForms = function (check) {
+            this.cdr.detectChanges();
+            if (!this.forms)
+                return false;
+            return ngxUtils.ObjectUtils.isDefined(this.forms.find(check));
+        };
+        DynamicFormsComponent.prototype.getFromValue = function (check) {
+            if (!this.forms)
+                return null;
+            var value = null;
+            this.forms.find(function (f) {
+                value = check(f);
+                return ngxUtils.ObjectUtils.isDefined(value);
+            });
+            return value;
+        };
+        DynamicFormsComponent.prototype.createFormGroups = function (configs) {
+            var _this = this;
+            return (configs || []).map(function (c) {
+                if (c.multi)
+                    return c;
+                var config = c;
+                var group = new DynamicFormGroup(_this, {
+                    id: config.id || ngxUtils.UniqueUtils.uuid(),
+                    type: "model",
+                    data: config.controlData
+                });
+                config.group = group;
+                config.name = config.name || _this.name;
+                group.setup(config.data, config);
+                group.reloadControls();
+                return config;
+            });
+        };
+        return DynamicFormsComponent;
+    }(DynamicFormBaseComponent));
+    DynamicFormsComponent.decorators = [
+        { type: core.Component, args: [{
+                    moduleId: module.id,
+                    selector: "dynamic-forms, [dynamic-forms]",
+                    template: "<ng-template #configTemplate let-formTemplate=\"formTemplate\" let-form=\"form\" let-config=\"config\" let-configTemplate>\r\n    <div [ngClass]=\"config.classes || ''\">\r\n        <ng-container [ngTemplateOutlet]=\"formPrefixTemplates[config.id]\"\r\n                      [ngTemplateOutletContext]=\"{config: config, form: form}\"></ng-container>\r\n        <ng-template #singleFormTemplate>\r\n            <div dynamic-form\r\n                 [hidden]=\"!config.group?.visible\"\r\n                 [ngClass]=\"config.formClasses || ''\"\r\n                 [name]=\"config.name || form.name\"\r\n                 [testId]=\"testId + '-' + (config.testId || config.name || name)\"\r\n                 [readonly]=\"form.readonly\"\r\n                 [updateOn]=\"form.updateOn\"\r\n                 [classes]=\"config.innerFormClasses\"\r\n                 [parent]=\"form\"\r\n\r\n                 [wrapperTemplate]=\"form.wrapperTemplate\"\r\n                 [fieldSetTemplate]=\"form.fieldSetTemplate\"\r\n                 [controlTemplates]=\"form.controlTemplates\"\r\n\r\n                 [controlTemplate]=\"form.controlTemplate\"\r\n                 [labelTemplates]=\"form.labelTemplates\"\r\n                 [inputTemplates]=\"form.inputTemplates\"\r\n                 [prefixTemplates]=\"form.prefixTemplates\"\r\n                 [suffixTemplates]=\"form.suffixTemplates\"\r\n                 [setPrefixTemplates]=\"form.setPrefixTemplates\"\r\n                 [setSuffixTemplates]=\"form.setSuffixTemplates\"\r\n\r\n                 [group]=\"config.group\"\r\n                 [fieldSets]=\"config.fieldSets\">\r\n                <ng-template #prefixTemplate let-subForm=\"form\">\r\n                    <ng-container [ngTemplateOutlet]=\"form.innerFormPrefixTemplates[config.id]\"\r\n                                  [ngTemplateOutletContext]=\"{config: config, form: subForm}\"></ng-container>\r\n                </ng-template>\r\n                <ng-template #suffixTemplate let-subForm=\"form\">\r\n                    <ng-container [ngTemplateOutlet]=\"form.innerFormSuffixTemplates[config.id]\"\r\n                                  [ngTemplateOutletContext]=\"{config: config, form: subForm}\"></ng-container>\r\n                </ng-template>\r\n            </div>\r\n        </ng-template>\r\n        <div dynamic-forms\r\n             [ngClass]=\"config.formClasses || ''\"\r\n             [name]=\"config.name || name\"\r\n             [testId]=\"testId + '-' + (config.testId || config.name || name)\"\r\n             [readonly]=\"form.readonly\"\r\n             [updateOn]=\"form.updateOn\"\r\n             [classes]=\"config.innerFormClasses\"\r\n             [parent]=\"form\"\r\n\r\n             [wrapperTemplate]=\"form.wrapperTemplate\"\r\n             [fieldSetTemplate]=\"form.fieldSetTemplate\"\r\n             [controlTemplates]=\"form.controlTemplates\"\r\n\r\n             [controlTemplate]=\"form.controlTemplate\"\r\n             [labelTemplates]=\"form.labelTemplates\"\r\n             [inputTemplates]=\"form.inputTemplates\"\r\n             [prefixTemplates]=\"form.prefixTemplates\"\r\n             [suffixTemplates]=\"form.suffixTemplates\"\r\n             [setPrefixTemplates]=\"form.setPrefixTemplates\"\r\n             [setSuffixTemplates]=\"form.setSuffixTemplates\"\r\n\r\n             [data]=\"config.data\"\r\n             [containerTemplate]=\"form.containerTemplate\"\r\n             [formPrefixTemplates]=\"form.formPrefixTemplates\"\r\n             [formSuffixTemplates]=\"form.formSuffixTemplates\"\r\n             [innerFormPrefixTemplates]=\"form.innerFormPrefixTemplates\"\r\n             [innerFormSuffixTemplates]=\"form.innerFormSuffixTemplates\"\r\n\r\n             *ngIf=\"config.multi; else singleFormTemplate\">\r\n            <ng-template #prefixTemplate let-subForm=\"form\">\r\n                <ng-container [ngTemplateOutlet]=\"form.innerFormPrefixTemplates[config.id]\"\r\n                              [ngTemplateOutletContext]=\"{config: config, form: subForm}\"></ng-container>\r\n            </ng-template>\r\n            <ng-template #suffixTemplate let-subForm=\"form\">\r\n                <ng-container [ngTemplateOutlet]=\"form.innerFormSuffixTemplates[config.id]\"\r\n                              [ngTemplateOutletContext]=\"{config: config, form: subForm}\"></ng-container>\r\n            </ng-template>\r\n        </div>\r\n        <ng-container [ngTemplateOutlet]=\"formSuffixTemplates[config.id]\"\r\n                      [ngTemplateOutletContext]=\"{config: config, form: form}\"></ng-container>\r\n    </div>\r\n</ng-template>\r\n<ng-template let-form=\"form\" let-configTemplate=\"configTemplate\" #defaultContainerTemplate>\r\n    <div class=\"dynamic-forms\" [ngClass]=\"classes || ''\">\r\n        <ng-container *ngFor=\"let config of form.configs\"\r\n                      [ngTemplateOutlet]=\"configTemplate\"\r\n                      [ngTemplateOutletContext]=\"{form: form, config: config}\"></ng-container>\r\n        <ng-content></ng-content>\r\n    </div>\r\n</ng-template>\r\n<ng-container [ngTemplateOutlet]=\"prefixTemplate\"\r\n              [ngTemplateOutletContext]=\"{form: this}\"></ng-container>\r\n<ng-container [ngTemplateOutlet]=\"containerTemplate || defaultContainerTemplate\"\r\n              [ngTemplateOutletContext]=\"{form: this, configTemplate: configTemplate, defaultContainerTemplate: defaultContainerTemplate}\">\r\n</ng-container>\r\n<ng-container [ngTemplateOutlet]=\"suffixTemplate\"\r\n              [ngTemplateOutletContext]=\"{form: this}\"></ng-container>\r\n",
+                    providers: [{ provide: DynamicFormBaseComponent, useExisting: DynamicFormsComponent }]
                 },] }
     ];
-    DynamicBaseFormArrayComponent.ctorParameters = function () { return [
-        { type: core.DynamicFormLayoutService },
-        { type: core.DynamicFormValidationService },
-        { type: core$1.Injector }
+    DynamicFormsComponent.ctorParameters = function () { return [
+        { type: core.ChangeDetectorRef },
+        { type: DynamicFormService }
     ]; };
-    DynamicBaseFormArrayComponent.propDecorators = {
-        formLayout: [{ type: core$1.Input }],
-        group: [{ type: core$1.Input }],
-        layout: [{ type: core$1.Input }],
-        model: [{ type: core$1.Input }],
-        templates: [{ type: core$1.Input }],
-        blur: [{ type: core$1.Output }],
-        change: [{ type: core$1.Output }],
-        customEvent: [{ type: core$1.Output }],
-        focus: [{ type: core$1.Output }],
-        components: [{ type: core$1.ViewChildren, args: [core$1.forwardRef(function () { return core.DynamicFormControlContainerComponent; }),] }]
+    DynamicFormsComponent.propDecorators = {
+        data: [{ type: core.Input }],
+        containerTemplate: [{ type: core.Input }],
+        formPrefixTemplates: [{ type: core.Input }],
+        formSuffixTemplates: [{ type: core.Input }],
+        innerFormPrefixTemplates: [{ type: core.Input }],
+        innerFormSuffixTemplates: [{ type: core.Input }],
+        cContainerTemplate: [{ type: core.ContentChild, args: ["containerTemplate",] }],
+        forms: [{ type: core.ViewChildren, args: [DynamicFormBaseComponent,] }]
     };
 
-    var DynamicBaseFormControlContainerComponent = /** @class */ (function (_super) {
-        __extends(DynamicBaseFormControlContainerComponent, _super);
-        function DynamicBaseFormControlContainerComponent(form, changeDetectorRef, componentFactoryResolver, layoutService, validationService, componentService, relationService) {
-            var _this = _super.call(this, changeDetectorRef, componentFactoryResolver, layoutService, validationService, componentService, relationService) || this;
-            _this.form = form;
-            _this.changeDetectorRef = changeDetectorRef;
-            _this.componentFactoryResolver = componentFactoryResolver;
-            _this.layoutService = layoutService;
-            _this.validationService = validationService;
-            _this.componentService = componentService;
-            _this.relationService = relationService;
-            _this.context = null;
-            _this.blur = new core$1.EventEmitter();
-            _this.change = new core$1.EventEmitter();
-            _this.focus = new core$1.EventEmitter();
-            return _this;
+    var DynamicFormGroupComponent = /** @class */ (function () {
+        function DynamicFormGroupComponent() {
         }
-        Object.defineProperty(DynamicBaseFormControlContainerComponent.prototype, "componentType", {
-            get: function () {
-                var _a;
-                return (_a = this.componentService.getCustomComponentType(this.model)) !== null && _a !== void 0 ? _a : this.getComponentType(this.model);
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(DynamicBaseFormControlContainerComponent.prototype, "startTemplate", {
+        Object.defineProperty(DynamicFormGroupComponent.prototype, "classes", {
             get: function () {
-                return (this.model.type == core.DYNAMIC_FORM_CONTROL_TYPE_ARRAY)
-                    ? this.layoutService.getAlignedTemplate(this.model, this.templates, "ARRAY_START")
-                    : this.layoutService.getStartTemplate(this.model, this.templates);
+                if (!this.control)
+                    return "form-group";
+                return ["form-group", "form-group-" + this.control.id, this.control.data.classes, this.control.errors && this.control.touched ? "form-group-invalid" : ""].join(" ");
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(DynamicBaseFormControlContainerComponent.prototype, "endTemplate", {
-            get: function () {
-                return (this.model.type == core.DYNAMIC_FORM_CONTROL_TYPE_ARRAY)
-                    ? this.layoutService.getAlignedTemplate(this.model, this.templates, "ARRAY_END")
-                    : this.layoutService.getEndTemplate(this.model, this.templates);
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(DynamicBaseFormControlContainerComponent.prototype, "formService", {
-            get: function () {
-                return this.form.formService;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        DynamicBaseFormControlContainerComponent.prototype.ngOnInit = function () {
+        return DynamicFormGroupComponent;
+    }());
+    DynamicFormGroupComponent.decorators = [
+        { type: core.Component, args: [{
+                    moduleId: module.id,
+                    selector: "div[dynamic-form-group]",
+                    template: "<ng-template #labelTemplate>\r\n    <label [ngClass]=\"'control-label control-label-' + control.data.labelAlign\" [attr.for]=\"control.formId\">\r\n        {{ control.label | translate: control.model }}\r\n    </label>\r\n</ng-template>\r\n<ng-template #errorTemplate>\r\n    <div class=\"error-message\" *ngIf=\"control.errors && control.touched\">\r\n        <span class=\"help-block\" *ngFor=\"let error of control.errors | entries\">\r\n            {{ error.key | translate: error.value }}\r\n        </span>\r\n    </div>\r\n</ng-template>\r\n<ng-template #inputTemplate let-control=\"control\">\r\n    <ng-container [form-control]=\"control\"></ng-container>\r\n</ng-template>\r\n<ng-template #defaultControlTemplate\r\n             let-context\r\n             let-control=\"control\"\r\n             let-data=\"control.data\"\r\n             let-labelTemplate=\"labelTemplate\"\r\n             let-inputTemplate=\"inputTemplate\"\r\n             let-prefixTemplate=\"prefixTemplate\"\r\n             let-suffixTemplate=\"suffixTemplate\"\r\n             let-errorTemplate=\"errorTemplate\">\r\n    <ng-container [ngTemplateOutlet]=\"prefixTemplate\"\r\n                  [ngTemplateOutletContext]=\"context\"></ng-container>\r\n    <ng-container *ngIf=\"control.label && data.labelAlign == 'left'\"\r\n                  [ngTemplateOutlet]=\"labelTemplate\"\r\n                  [ngTemplateOutletContext]=\"context\">\r\n    </ng-container>\r\n    <ng-container [ngTemplateOutlet]=\"inputTemplate\"\r\n                  [ngTemplateOutletContext]=\"context\"></ng-container>\r\n    <ng-container *ngIf=\"control.label && data.labelAlign == 'right'\"\r\n                  [ngTemplateOutlet]=\"labelTemplate\"\r\n                  [ngTemplateOutletContext]=\"context\">\r\n    </ng-container>\r\n    <ng-container [ngTemplateOutlet]=\"suffixTemplate\"\r\n                  [ngTemplateOutletContext]=\"context\"></ng-container>\r\n    <ng-container [ngTemplateOutlet]=\"errorTemplate\"\r\n                  [ngTemplateOutletContext]=\"context\"></ng-container>\r\n</ng-template>\r\n\r\n<ng-container [ngxTemplateOutlet]=\"form.controlTemplates[control.id] || form.controlTemplate || defaultControlTemplate\"\r\n              [context]=\"{\r\n                    control: control,\r\n                    labelTemplate: form.labelTemplates[control.id] || labelTemplate,\r\n                    inputTemplate: form.inputTemplates[control.id] || inputTemplate,\r\n                    prefixTemplate: form.prefixTemplates[control.id],\r\n                    suffixTemplate: form.suffixTemplates[control.id],\r\n                    errorTemplate: errorTemplate\r\n                  }\">\r\n</ng-container>\r\n"
+                },] }
+    ];
+    DynamicFormGroupComponent.propDecorators = {
+        classes: [{ type: core.HostBinding, args: ["class",] }]
+    };
+
+    var DynamicFormFileComponent = /** @class */ (function (_super) {
+        __extends(DynamicFormFileComponent, _super);
+        function DynamicFormFileComponent(api, toaster) {
+            var _this = _super.call(this) || this;
+            _this.api = api;
+            _this.toaster = toaster;
+            _this.fileImageCache = [];
+            return _this;
+        }
+        // Acceptor for provider
+        DynamicFormFileComponent.acceptor = function (control) {
+            return control.type == "file";
+        };
+        // Loader for provider
+        DynamicFormFileComponent.loader = function () {
+            return Promise.resolve();
+        };
+        DynamicFormFileComponent.prototype.onSelect = function (input) {
+            this.processFiles(input.files);
+            input.value = "";
+        };
+        DynamicFormFileComponent.prototype.processFiles = function (fileList) {
+            var files = [];
+            var accept = this.data.accept;
+            var types = ngxUtils.ObjectUtils.isString(accept) && accept.length > 0 ? accept.toLowerCase().split(",") : null;
+            if (fileList.length == 0)
+                return;
+            for (var i = 0; i < fileList.length; i++) {
+                var file = fileList.item(i);
+                var type = file.type.toLowerCase();
+                var ext = ngxUtils.FileUtils.getExtension(file);
+                if (types && !ngxUtils.ArrayUtils.has(types, type, ext))
+                    continue;
+                files.push(file);
+            }
+            if (files.length == 0) {
+                this.toaster.error("message.error.wrong-files");
+                return;
+            }
+            this.upload(files);
+        };
+        DynamicFormFileComponent.prototype.upload = function (files) {
             var _this = this;
-            this.onDetectChanges = this.formService.onDetectChanges.subscribe(function (form) {
-                if (form !== _this.form)
+            var single = !this.data.multi;
+            if (single)
+                files.length = Math.min(files.length, 1);
+            var promises = [];
+            files.forEach(function (file, ix) {
+                if (_this.data.asDataUrl) {
+                    promises.push(ngxUtils.FileUtils.readFileAsDataURL(file));
                     return;
-                _this.changeDetectorRef.detectChanges();
-                _this.formService.updateSelectOptions(_this.model, _this.control, _this.form.model);
+                }
+                if (_this.data.asFile) {
+                    promises.push(Promise.resolve(file));
+                    return;
+                }
+                promises.push(_this.api.upload(_this.data.uploadUrl, _this.data.createUploadData(file), console.log, _this.data.uploadOptions).then(function (asset) { return asset._id || asset; }, function () { return null; }));
+            });
+            Promise.all(promises).then(function (assets) {
+                if (single) {
+                    _this.control.setValue(assets[0]);
+                    return;
+                }
+                var current = _this.value || [];
+                _this.control.setValue(current.concat(assets.filter(function (t) { return !!t; })));
             });
         };
-        DynamicBaseFormControlContainerComponent.prototype.ngOnDestroy = function () {
-            _super.prototype.ngOnDestroy.call(this);
-            this.onDetectChanges.unsubscribe();
-        };
-        DynamicBaseFormControlContainerComponent.prototype.getLabel = function () {
-            var _a;
-            var label = collectPathAble(this.model, function (p) { return p.label; });
-            if (label.length == 0)
-                return "";
-            if ((_a = this.form) === null || _a === void 0 ? void 0 : _a.labelPrefix) {
-                label.unshift(this.form.labelPrefix);
+        DynamicFormFileComponent.prototype.delete = function (index) {
+            if (this.data.multi) {
+                var current = Array.from(this.value || []);
+                current.splice(index, 1);
+                this.control.setValue(current);
+                return;
+            }
+            this.control.setValue(null);
+        };
+        DynamicFormFileComponent.prototype.getUrl = function (image) {
+            return "url('" + this.getImgUrl(image) + "')";
+        };
+        DynamicFormFileComponent.prototype.getImgUrl = function (image) {
+            if (ngxUtils.ObjectUtils.isBlob(image)) {
+                var cache = this.fileImageCache.find(function (t) { return t.file == image; });
+                if (!cache) {
+                    cache = { file: image, url: URL.createObjectURL(image) };
+                    this.fileImageCache.push(cache);
+                }
+                return cache.url;
+            }
+            var url = !image ? null : image.imageUrl || image;
+            if (!ngxUtils.ObjectUtils.isString(url))
+                return null;
+            if (url.startsWith("data:"))
+                return url;
+            if (!this.data.baseUrl) {
+                var subUrl = url.startsWith("/") ? url.substr(1) : url;
+                return this.api.url(subUrl);
             }
-            return label.join(".");
+            return this.api.url("" + this.data.baseUrl + url);
+        };
+        return DynamicFormFileComponent;
+    }(FormControlComponent));
+    DynamicFormFileComponent.decorators = [
+        { type: core.Component, args: [{
+                    selector: "dynamic-form-file",
+                    template: "<div class=\"upload\">\r\n    <input type=\"file\"\r\n           multiple=\"multiple\"\r\n           [attr.data-testid]=\"testId\"\r\n           [attr.accept]=\"data.accept\"\r\n           (change)=\"onSelect($event.target)\" />\r\n    <ul class=\"images\" *ngIf=\"!data.multi\">\r\n        <li class=\"image\" *ngIf=\"value\" [ngStyle]=\"{backgroundImage: getUrl(value)}\">\r\n            <a class=\"btn btn-delete\" (click)=\"delete()\"></a>\r\n        </li>\r\n    </ul>\r\n    <ul class=\"images\" *ngIf=\"data.multi\">\r\n        <li class=\"image\" *ngFor=\"let image of value; let i = index\" [ngStyle]=\"{backgroundImage: getUrl(image)}\">\r\n            <a class=\"btn btn-delete\" (click)=\"delete(i)\"></a>\r\n        </li>\r\n    </ul>\r\n</div>\r\n",
+                    styles: [".upload{display:inline-block}.upload ul{display:inline-flex;list-style:none;margin:10px 0 0;padding:0}.upload ul li{height:100px;width:100px;background:repeating-linear-gradient(45deg,gray,gray 10px,lightgray 10px,lightgray 20px) center center;background-size:cover;border:1px gray solid;margin-right:5px;position:relative}.upload .btn-delete{background:linear-gradient(to bottom,#c8607a,#a64d5a);border-color:#a64d5a;color:#fff;position:absolute;padding:0;right:5px;top:5px;width:20px;height:20px}.upload .btn-delete:before{color:#fff;display:block;position:absolute;top:0;right:6px;content:\"x\"}\n"]
+                },] }
+    ];
+    DynamicFormFileComponent.ctorParameters = function () { return [
+        { type: ngxUtils.ApiService },
+        { type: undefined, decorators: [{ type: core.Inject, args: [ngxUtils.TOASTER_SERVICE,] }] }
+    ]; };
+
+    var DynamicFormInputComponent = /** @class */ (function (_super) {
+        __extends(DynamicFormInputComponent, _super);
+        function DynamicFormInputComponent(language) {
+            var _this = _super.call(this) || this;
+            _this.language = language;
+            return _this;
+        }
+        // Acceptor for provider
+        DynamicFormInputComponent.acceptor = function (control) {
+            return control.type == "input";
+        };
+        // Loader for provider
+        DynamicFormInputComponent.loader = function () {
+            return Promise.resolve();
         };
-        DynamicBaseFormControlContainerComponent.prototype.createFormControlComponent = function () {
-            var _a;
-            _super.prototype.createFormControlComponent.call(this);
-            var component = (_a = this.componentRef) === null || _a === void 0 ? void 0 : _a.instance;
-            if (!component || !ngxUtils.ObjectUtils.isFunction(component.onCreated))
+        Object.defineProperty(DynamicFormInputComponent.prototype, "isChecked", {
+            get: function () {
+                return this.data.type == "checkbox" && this.value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DynamicFormInputComponent.prototype.onDateChange = function (value) {
+            var date = new Date(value);
+            var dateValue = date.valueOf();
+            if (isNaN(dateValue) || dateValue < -30610224000000)
                 return;
-            component.onCreated();
+            this.control.setValue(date);
         };
-        DynamicBaseFormControlContainerComponent.prototype.getComponentType = function (model) {
-            return null;
+        DynamicFormInputComponent.prototype.onTextChange = function (value) {
+            var _this = this;
+            if (!this.data.useLanguage) {
+                this.control.setValue(value);
+                return;
+            }
+            var translations = ngxUtils.ObjectUtils.isArray(this.value) ? Array.from(this.value) : [];
+            var translation = translations.find(function (t) { return t.lang == _this.language.editLanguage; });
+            if (translation) {
+                translation.translation = value;
+            }
+            else {
+                translations.push({
+                    lang: this.language.editLanguage,
+                    translation: value
+                });
+            }
+            this.control.setValue(translations);
         };
-        return DynamicBaseFormControlContainerComponent;
-    }(core.DynamicFormControlContainerComponent));
-    DynamicBaseFormControlContainerComponent.decorators = [
-        { type: core$1.Component, args: [{
-                    selector: "dynamic-base-form-control",
-                    template: "",
-                    changeDetection: core$1.ChangeDetectionStrategy.OnPush
+        DynamicFormInputComponent.prototype.onNumberBlur = function () {
+            var value = this.value;
+            if (ngxUtils.ObjectUtils.isNumber(this.data.max) && this.data.max < value) {
+                this.control.setValue(this.data.max);
+            }
+            else if (ngxUtils.ObjectUtils.isNumber(this.data.min) && this.data.min > value) {
+                this.control.setValue(this.data.min);
+            }
+            this.control.onBlur();
+        };
+        return DynamicFormInputComponent;
+    }(FormControlComponent));
+    DynamicFormInputComponent.decorators = [
+        { type: core.Component, args: [{
+                    moduleId: module.id,
+                    selector: "dynamic-form-input",
+                    template: "<ng-container [ngSwitch]=\"data.type\">\r\n    <ng-container *ngSwitchCase=\"'textarea'\">\r\n        <textarea class=\"form-control\"\r\n                  rows=\"5\"\r\n                  [attr.autocomplete]=\"data.autocomplete\"\r\n                  [attr.data-testid]=\"testId\"\r\n                  [id]=\"control.formId\"\r\n                  [name]=\"control.formId\"\r\n                  [ngClass]=\"{disabled: control.disabled}\"\r\n                  [disabled]=\"control.disabled\"\r\n                  [ngModel]=\"value\"\r\n                  (ngModelChange)=\"control.setValue($event)\"\r\n                  (blur)=\"control.onBlur()\"\r\n                  (focus)=\"control.onFocus()\">{{ data.placeholder | translate }}</textarea>\r\n    </ng-container>\r\n    <ng-container *ngSwitchCase=\"'date'\">\r\n        <input class=\"form-control\"\r\n               type=\"date\"\r\n               [attr.autocomplete]=\"data.autocomplete\"\r\n               [attr.data-testid]=\"testId\"\r\n               [id]=\"control.formId\"\r\n               [name]=\"control.formId\"\r\n               [ngClass]=\"{disabled: control.disabled}\"\r\n               [disabled]=\"control.disabled\"\r\n               [ngModel]=\"value | date: 'y-MM-dd'\"\r\n               (ngModelChange)=\"onDateChange($event)\"\r\n               (blur)=\"control.onBlur()\"\r\n               (focus)=\"control.onFocus()\"/>\r\n    </ng-container>\r\n    <ng-container *ngSwitchCase=\"'number'\">\r\n        <input class=\"form-control\"\r\n               type=\"number\"\r\n               [attr.autocomplete]=\"data.autocomplete\"\r\n               [attr.data-testid]=\"testId\"\r\n               [min]=\"data.min\"\r\n               [max]=\"data.max\"\r\n               [step]=\"data.step\"\r\n               [id]=\"control.formId\"\r\n               [name]=\"control.formId\"\r\n               [ngClass]=\"{disabled: control.disabled}\"\r\n               [disabled]=\"control.disabled\"\r\n               [ngModel]=\"value\"\r\n               (ngModelChange)=\"control.setValue($event)\"\r\n               (blur)=\"onNumberBlur()\"\r\n               (focus)=\"control.onFocus()\"/>\r\n    </ng-container>\r\n    <ng-container *ngSwitchCase=\"'checkbox'\">\r\n        <input class=\"form-control\"\r\n               type=\"checkbox\"\r\n               [attr.data-testid]=\"testId\"\r\n               [id]=\"control.formId\"\r\n               [name]=\"control.formId\"\r\n               [ngClass]=\"{disabled: control.disabled}\"\r\n               [disabled]=\"control.disabled\"\r\n               [ngModel]=\"value\"\r\n               (ngModelChange)=\"control.setValue($event)\"\r\n               (blur)=\"control.onBlur()\"\r\n               (focus)=\"control.onFocus()\"/>\r\n    </ng-container>\r\n    <ng-container *ngSwitchCase=\"'text'\">\r\n        <input class=\"form-control\"\r\n               type=\"text\"\r\n               [attr.autocomplete]=\"data.autocomplete\"\r\n               [attr.data-testid]=\"testId\"\r\n               [minlength]=\"data.min\"\r\n               [maxlength]=\"data.max\"\r\n               [placeholder]=\"data.placeholder | translate\"\r\n               [id]=\"control.formId\"\r\n               [name]=\"control.formId\"\r\n               [ngClass]=\"{disabled: control.disabled}\"\r\n               [disabled]=\"control.disabled\"\r\n               [ngModel]=\"data.useLanguage ? (value | translate) : value\"\r\n               (ngModelChange)=\"onTextChange($event)\"\r\n               (blur)=\"control.onBlur()\"\r\n               (focus)=\"control.onFocus()\"/>\r\n    </ng-container>\r\n    <ng-container *ngSwitchDefault>\r\n        <input class=\"form-control\"\r\n               [attr.autocomplete]=\"data.autocomplete\"\r\n               [attr.data-testid]=\"testId\"\r\n               [minlength]=\"data.min\"\r\n               [maxlength]=\"data.max\"\r\n               [placeholder]=\"data.placeholder | translate\"\r\n               [type]=\"data.type\"\r\n               [id]=\"control.formId\"\r\n               [name]=\"control.formId\"\r\n               [ngClass]=\"{disabled: control.disabled}\"\r\n               [disabled]=\"control.disabled\"\r\n               [ngModel]=\"value\"\r\n               (ngModelChange)=\"control.setValue($event)\"\r\n               (blur)=\"control.onBlur()\"\r\n               (focus)=\"control.onFocus()\"/>\r\n    </ng-container>\r\n</ng-container>\r\n"
                 },] }
     ];
-    DynamicBaseFormControlContainerComponent.ctorParameters = function () { return [
-        { type: DynamicBaseFormComponent },
-        { type: core$1.ChangeDetectorRef },
-        { type: core$1.ComponentFactoryResolver },
-        { type: core.DynamicFormLayoutService },
-        { type: core.DynamicFormValidationService },
-        { type: core.DynamicFormComponentService },
-        { type: core.DynamicFormRelationService }
+    DynamicFormInputComponent.ctorParameters = function () { return [
+        { type: undefined, decorators: [{ type: core.Inject, args: [ngxUtils.LANGUAGE_SERVICE,] }] }
     ]; };
-    DynamicBaseFormControlContainerComponent.propDecorators = {
-        contentTemplateList: [{ type: core$1.ContentChildren, args: [core.DynamicTemplateDirective,] }],
-        klass: [{ type: core$1.HostBinding, args: ["class",] }],
-        context: [{ type: core$1.Input }],
-        group: [{ type: core$1.Input }],
-        hostClass: [{ type: core$1.Input }],
-        inputTemplateList: [{ type: core$1.Input, args: ["templates",] }],
-        layout: [{ type: core$1.Input }],
-        model: [{ type: core$1.Input }],
-        blur: [{ type: core$1.Output }],
-        change: [{ type: core$1.Output }],
-        focus: [{ type: core$1.Output }],
-        componentViewContainerRef: [{ type: core$1.ViewChild, args: ["componentViewContainer", { read: core$1.ViewContainerRef, static: true },] }]
+    DynamicFormInputComponent.propDecorators = {
+        isChecked: [{ type: core.HostBinding, args: ["class.checked",] }]
     };
 
-    var DynamicBaseFormGroupComponent = /** @class */ (function (_super) {
-        __extends(DynamicBaseFormGroupComponent, _super);
-        function DynamicBaseFormGroupComponent(layoutService, validationService) {
-            var _this = _super.call(this, layoutService, validationService) || this;
-            _this.layoutService = layoutService;
-            _this.validationService = validationService;
-            _this.blur = new core$1.EventEmitter();
-            _this.change = new core$1.EventEmitter();
-            _this.customEvent = new core$1.EventEmitter();
-            _this.focus = new core$1.EventEmitter();
-            return _this;
+    var DynamicFormSelectComponent = /** @class */ (function (_super) {
+        __extends(DynamicFormSelectComponent, _super);
+        function DynamicFormSelectComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
         }
-        DynamicBaseFormGroupComponent.prototype.getClass = function (context, place, model) {
-            return [
-                context == "element" ? this.getModelClass(model) : null,
-                context == "element" ? this.getAdditionalClass(model) : null,
-                _super.prototype.getClass.call(this, context, place, model)
-            ].filter(function (cls) { return !!cls; }).join(" ");
-        };
-        DynamicBaseFormGroupComponent.prototype.getModelClass = function (model) {
-            var parts = collectPathAble(model, function (p) { return p.id; });
-            if (parts.length == 0)
-                return "";
-            if (model instanceof core.DynamicFormGroupModel) {
-                return "form-group-" + parts.join("-");
+        // Acceptor for provider
+        DynamicFormSelectComponent.acceptor = function (control) {
+            return control.type == "select";
+        };
+        // Loader for provider
+        DynamicFormSelectComponent.loader = function (control) {
+            var data = control.getData();
+            if (data.type == "radio" && data.multi) {
+                return Promise.reject("Radio group doesn't support multi select!");
             }
-            return "form-control-" + parts.join("-");
+            return new Promise(function (resolve) {
+                var getOptions = ngxUtils.ReflectUtils.resolve(data.options, control.form.injector);
+                getOptions(control).then(function (options) {
+                    if (data.emptyOption)
+                        options.unshift({ id: null, label: "" });
+                    control.meta.options = options;
+                    DynamicFormSelectComponent.fillOptions(control, options);
+                    resolve(options);
+                });
+            });
         };
-        DynamicBaseFormGroupComponent.prototype.getAdditionalClass = function (model) {
-            var _a, _b;
-            if (model instanceof DynamicFormArrayModel) {
-                return (_a = model.additional) === null || _a === void 0 ? void 0 : _a.classes;
+        DynamicFormSelectComponent.fillOptions = function (control, options) {
+            var data = control.getData();
+            var selected = control.value;
+            if (data.multi || options.length == 0 || options.findIndex(function (t) { return t.id == selected; }) >= 0)
+                return;
+            control.setValue(options[0].id);
+        };
+        DynamicFormSelectComponent.prototype.onSelectChange = function (value) {
+            var isArray = ngxUtils.ObjectUtils.isArray(value);
+            var current = this.value;
+            if (this.data.multi) {
+                if (isArray) {
+                    this.control.setValue(value);
+                    return;
+                }
+                if (ngxUtils.ObjectUtils.isArray(current)) {
+                    this.control.setValue(current.indexOf(value) < 0
+                        ? current.concat([value])
+                        : current.filter(function (c) { return c !== value; }));
+                    return;
+                }
+                this.control.setValue([value]);
+                return;
             }
-            if (model instanceof core.DynamicFormValueControlModel) {
-                return (_b = model.additional) === null || _b === void 0 ? void 0 : _b.classes;
+            if (isArray)
+                value = value[0];
+            if (current == value) {
+                var option = this.meta.options.find(function (o) { return o.id !== value; });
+                value = option ? option.id : null;
             }
-            return null;
+            this.control.setValue(value);
+        };
+        DynamicFormSelectComponent.prototype.checkValue = function (option) {
+            var value = this.value;
+            return ngxUtils.ObjectUtils.isArray(value) ? value.indexOf(option.id) >= 0 : option.id == value;
+        };
+        DynamicFormSelectComponent.prototype.findOption = function (option, index, id) {
+            return option.id == id;
+        };
+        return DynamicFormSelectComponent;
+    }(FormControlComponent));
+    DynamicFormSelectComponent.decorators = [
+        { type: core.Component, args: [{
+                    moduleId: module.id,
+                    selector: "dynamic-form-select",
+                    template: "<ng-template #selectTemplate let-selected=\"selected\">\r\n    <select class=\"form-control\"\r\n            [attr.data-testid]=\"testId\"\r\n            [multiple]=\"data.multi\"\r\n            [id]=\"control.formId\"\r\n            [name]=\"control.formId\"\r\n            [ngClass]=\"{disabled: control.disabled}\"\r\n            [disabled]=\"control.disabled\"\r\n            [ngModel]=\"data.multi ? value : [value]\"\r\n            (ngModelChange)=\"onSelectChange($event)\"\r\n            (blur)=\"control.onBlur()\"\r\n            (focus)=\"control.onFocus()\">\r\n        <option *ngFor=\"let option of meta.options\" [value]=\"option.id\" [disabled]=\"option.selectable == false\">\r\n            {{ option.label | translate }}\r\n        </option>\r\n    </select>\r\n    <label class=\"form-control-description\" [attr.for]=\"control.formId\" *ngIf=\"!data.multi && selected?.description\">\r\n        {{ selected?.description | translate }}\r\n    </label>\r\n</ng-template>\r\n<ng-container [ngSwitch]=\"data.type\">\r\n    <ng-container *ngSwitchCase=\"'radio'\">\r\n        <ul class=\"radio-group\">\r\n            <li *ngFor=\"let option of meta.options\" class=\"radio\">\r\n                <label [ngClass]=\"{checked: value == option.id}\">\r\n                    <input type=\"radio\"\r\n                           [attr.data-testid]=\"testId + '-' + option.id\"\r\n                           [id]=\"control.formId + '-' + option.id\"\r\n                           [name]=\"control.formId + '-' + option.id\"\r\n                           [ngClass]=\"{disabled: control.disabled}\"\r\n                           [disabled]=\"control.disabled || option.selectable == false\"\r\n                           [value]=\"option.id\"\r\n                           [ngModel]=\"value\"\r\n                           (ngModelChange)=\"onSelectChange(option.id)\"\r\n                           (blur)=\"control.onBlur()\"\r\n                           (focus)=\"control.onFocus()\">\r\n                    {{ option.label | translate }}\r\n                </label>\r\n            </li>\r\n        </ul>\r\n    </ng-container>\r\n    <ng-container *ngSwitchCase=\"'checkbox'\">\r\n        <ul class=\"checkbox-group\">\r\n            <li *ngFor=\"let option of meta.options\" class=\"checkbox\">\r\n                <label [ngClass]=\"{checked: checkValue(option)}\">\r\n                    <input type=\"checkbox\"\r\n                           [attr.data-testid]=\"testId + '-' + option.id\"\r\n                           [id]=\"control.formId + '-' + option.id\"\r\n                           [name]=\"control.formId + '-' + option.id\"\r\n                           [ngClass]=\"{disabled: control.disabled}\"\r\n                           [disabled]=\"control.disabled || option.selectable == false\"\r\n                           [ngModel]=\"checkValue(option)\"\r\n                           (ngModelChange)=\"onSelectChange(option.id)\"\r\n                           (blur)=\"control.onBlur()\"\r\n                           (focus)=\"control.onFocus()\">\r\n                    {{ option.label | translate }}\r\n                </label>\r\n            </li>\r\n        </ul>\r\n    </ng-container>\r\n    <ng-container *ngSwitchDefault [ngTemplateOutlet]=\"selectTemplate\" [ngTemplateOutletContext]=\"{selected: meta?.options | find:findOption:value}\">\r\n\r\n    </ng-container>\r\n</ng-container>\r\n"
+                },] }
+    ];
+
+    var DynamicFormStaticComponent = /** @class */ (function (_super) {
+        __extends(DynamicFormStaticComponent, _super);
+        function DynamicFormStaticComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        // Acceptor for provider
+        DynamicFormStaticComponent.acceptor = function (control) {
+            return control.type == "static";
+        };
+        // Loader for provider
+        DynamicFormStaticComponent.loader = function () {
+            return Promise.resolve();
+        };
+        return DynamicFormStaticComponent;
+    }(FormControlComponent));
+    DynamicFormStaticComponent.decorators = [
+        { type: core.Component, args: [{
+                    moduleId: module.id,
+                    selector: "dynamic-form-static",
+                    template: "<unordered-list [listStyle]=\"data.style\" [ngClass]=\"{disabled: control.disabled}\"\r\n                [data]=\"!data.properties ? {value: value} : data.properties | remap: value\">\r\n    <ng-template [type]=\"!data.properties ? 'key' : null\" selector=\"level == 0\" let-item=\"item\"></ng-template>\r\n    <ng-template type=\"value\" selector=\"valueType == 'date'\" let-item=\"item\">\r\n        {{ item.value | date }}\r\n    </ng-template>\r\n</unordered-list>\r\n"
+                },] }
+    ];
+
+    var DynamicFormModelComponent = /** @class */ (function (_super) {
+        __extends(DynamicFormModelComponent, _super);
+        function DynamicFormModelComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        // Acceptor for provider
+        DynamicFormModelComponent.acceptor = function (control) {
+            return control.type == "model";
+        };
+        // Loader for provider
+        DynamicFormModelComponent.loader = function () {
+            return Promise.resolve();
+        };
+        return DynamicFormModelComponent;
+    }(FormControlComponent));
+    DynamicFormModelComponent.decorators = [
+        { type: core.Component, args: [{
+                    moduleId: module.id,
+                    selector: "dynamic-form-model",
+                    template: "<dynamic-form [testId]=\"form.testId + '-' + control.id\"\r\n              [name]=\"data.name || form.name\"\r\n              [group]=\"control\"\r\n              [data]=\"value\"\r\n              [updateOn]=\"control.updateOn\"\r\n              [parent]=\"form\"\r\n\r\n              [fieldSetTemplate]=\"form.fieldSetTemplate\"\r\n              [controlTemplates]=\"form.controlTemplates\"\r\n\r\n              [controlTemplate]=\"form.controlTemplate\"\r\n              [labelTemplates]=\"form.labelTemplates\"\r\n              [inputTemplates]=\"form.inputTemplates\"\r\n              [prefixTemplates]=\"form.prefixTemplates\"\r\n              [suffixTemplates]=\"form.suffixTemplates\"\r\n              [setPrefixTemplates]=\"form.setPrefixTemplates\"\r\n              [setSuffixTemplates]=\"form.setSuffixTemplates\"\r\n\r\n              #subForm>\r\n    <ng-template #wrapperTemplate let-form=\"form\" let-fieldSetsTemplate=\"fieldSetsTemplate\">\r\n        <ng-container [ngTemplateOutlet]=\"fieldSetsTemplate\"></ng-container>\r\n    </ng-template>\r\n</dynamic-form>\r\n"
+                },] }
+    ];
+    DynamicFormModelComponent.propDecorators = {
+        subForm: [{ type: core.ViewChild, args: ["subForm",] }]
+    };
+
+    var DynamicFormGroupDirective = /** @class */ (function () {
+        function DynamicFormGroupDirective(vcr, forms) {
+            this.vcr = vcr;
+            this.forms = forms;
+        }
+        Object.defineProperty(DynamicFormGroupDirective.prototype, "component", {
+            get: function () {
+                return this.comp;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DynamicFormGroupDirective.prototype.ngOnChanges = function (changes) {
+            if (changes.control || changes.form || changes.visible) {
+                if (!this.visible) {
+                    this.vcr.clear();
+                    this.comp = null;
+                    return;
+                }
+                this.comp = this.forms.createGroup(this.vcr);
+            }
+            if (!this.comp)
+                return;
+            this.comp.form = this.form;
+            this.comp.control = this.control;
         };
-        return DynamicBaseFormGroupComponent;
-    }(core.DynamicFormGroupComponent));
-    DynamicBaseFormGroupComponent.decorators = [
-        { type: core$1.Component, args: [{
-                    selector: "dynamic-base-form-group",
-                    template: "",
-                    changeDetection: core$1.ChangeDetectionStrategy.OnPush
+        return DynamicFormGroupDirective;
+    }());
+    DynamicFormGroupDirective.decorators = [
+        { type: core.Directive, args: [{
+                    selector: "[form-group]",
                 },] }
     ];
-    DynamicBaseFormGroupComponent.ctorParameters = function () { return [
-        { type: core.DynamicFormLayoutService },
-        { type: core.DynamicFormValidationService }
+    DynamicFormGroupDirective.ctorParameters = function () { return [
+        { type: core.ViewContainerRef },
+        { type: DynamicFormService }
     ]; };
-    DynamicBaseFormGroupComponent.propDecorators = {
-        formLayout: [{ type: core$1.Input }],
-        group: [{ type: core$1.Input }],
-        layout: [{ type: core$1.Input }],
-        model: [{ type: core$1.Input }],
-        templates: [{ type: core$1.Input }],
-        blur: [{ type: core$1.Output }],
-        change: [{ type: core$1.Output }],
-        customEvent: [{ type: core$1.Output }],
-        focus: [{ type: core$1.Output }],
-        components: [{ type: core$1.ViewChildren, args: [core$1.forwardRef(function () { return core.DynamicFormControlContainerComponent; }),] }]
+    DynamicFormGroupDirective.propDecorators = {
+        control: [{ type: core.Input, args: ["form-group",] }],
+        form: [{ type: core.Input }],
+        visible: [{ type: core.Input }]
     };
 
     // --- Components ---
     var components = [
-        DynamicBaseFormComponent,
-        DynamicBaseFormArrayComponent,
-        DynamicBaseFormControlContainerComponent,
-        DynamicBaseFormGroupComponent
+        DynamicFormsComponent,
+        DynamicFormComponent,
+        DynamicFormGroupComponent,
+        DynamicFormFileComponent,
+        DynamicFormInputComponent,
+        DynamicFormSelectComponent,
+        DynamicFormStaticComponent,
+        DynamicFormModelComponent
     ];
     // --- Directives ---
     var directives = [
         AsyncSubmitDirective,
+        DynamicFormControlDirective,
+        DynamicFormGroupDirective,
+        DynamicFormTemplateDirective
     ];
     // --- Pipes ---
     var pipes = [];
-    var ɵ0 = validateJSON, ɵ1 = validateRequiredTranslation, ɵ2 = validateItemsMinLength, ɵ3 = validateItemsMaxLength, ɵ4 = validateItemsMinValue, ɵ5 = validateItemsMaxValue, ɵ6 = new Map([
-        ["json", validateJSON],
-        ["requiredTranslation", validateRequiredTranslation],
-        ["phone", validatePhone],
-        ["itemsMinLength", validateItemsMinLength],
-        ["itemsMaxLength", validateItemsMaxLength],
-        ["itemsMinValue", validateItemsMinValue],
-        ["itemsMaxValue", validateItemsMaxValue],
-    ]);
     var NgxDynamicFormModule = /** @class */ (function () {
         function NgxDynamicFormModule() {
         }
-        NgxDynamicFormModule.forRoot = function () {
+        NgxDynamicFormModule.forRoot = function (controlProviders, groupProvider) {
             return {
                 ngModule: NgxDynamicFormModule,
-                providers: [
+                providers: __spreadArray(__spreadArray([
                     DynamicFormService,
-                    {
-                        provide: core.DynamicFormService,
-                        useExisting: DynamicFormService
-                    }
-                ]
+                    OpenApiService,
+                    provideFormControl(DynamicFormFileComponent, DynamicFormFileComponent.acceptor, DynamicFormFileComponent.loader),
+                    provideFormControl(DynamicFormInputComponent, DynamicFormInputComponent.acceptor, DynamicFormInputComponent.loader),
+                    provideFormControl(DynamicFormSelectComponent, DynamicFormSelectComponent.acceptor, DynamicFormSelectComponent.loader),
+                    provideFormControl(DynamicFormStaticComponent, DynamicFormStaticComponent.acceptor, DynamicFormStaticComponent.loader),
+                    provideFormControl(DynamicFormModelComponent, DynamicFormModelComponent.acceptor, DynamicFormModelComponent.loader)
+                ], __read((controlProviders || []))), [
+                    groupProvider || provideFormGroup(DynamicFormGroupComponent)
+                ])
             };
         };
         return NgxDynamicFormModule;
     }());
     NgxDynamicFormModule.decorators = [
-        { type: core$1.NgModule, args: [{
-                    declarations: __spread(components, directives, pipes),
+        { type: core.NgModule, args: [{
+                    declarations: __spreadArray(__spreadArray(__spreadArray([], __read(components)), __read(directives)), __read(pipes)),
                     imports: [
                         common.CommonModule,
                         forms.FormsModule,
                         forms.ReactiveFormsModule,
                         ngxUtils.NgxUtilsModule
                     ],
-                    exports: __spread(components, directives, pipes, [
+                    exports: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(components)), __read(directives)), __read(pipes)), [
                         forms.FormsModule,
                         forms.ReactiveFormsModule,
                         ngxUtils.NgxUtilsModule
                     ]),
                     entryComponents: components,
-                    providers: __spread(pipes, [
-                        { provide: forms.NG_VALIDATORS, useValue: ɵ0, multi: true },
-                        { provide: forms.NG_VALIDATORS, useValue: ɵ1, multi: true },
-                        { provide: forms.NG_VALIDATORS, useValue: ɵ2, multi: true },
-                        { provide: forms.NG_VALIDATORS, useValue: ɵ3, multi: true },
-                        { provide: forms.NG_VALIDATORS, useValue: ɵ4, multi: true },
-                        { provide: forms.NG_VALIDATORS, useValue: ɵ5, multi: true },
-                        {
-                            provide: core.DYNAMIC_VALIDATORS,
-                            useValue: ɵ6
-                        }
-                    ])
+                    providers: pipes
                 },] }
     ];
 
@@ -1733,21 +2305,32 @@
      */
 
     exports.AsyncSubmitDirective = AsyncSubmitDirective;
-    exports.DynamicBaseFormArrayComponent = DynamicBaseFormArrayComponent;
-    exports.DynamicBaseFormComponent = DynamicBaseFormComponent;
-    exports.DynamicBaseFormControlContainerComponent = DynamicBaseFormControlContainerComponent;
-    exports.DynamicBaseFormGroupComponent = DynamicBaseFormGroupComponent;
-    exports.DynamicFormArrayModel = DynamicFormArrayModel;
+    exports.DynamicFormBaseComponent = DynamicFormBaseComponent;
+    exports.DynamicFormComponent = DynamicFormComponent;
+    exports.DynamicFormControl = DynamicFormControl;
+    exports.DynamicFormControlDirective = DynamicFormControlDirective;
+    exports.DynamicFormFileComponent = DynamicFormFileComponent;
+    exports.DynamicFormGroup = DynamicFormGroup;
+    exports.DynamicFormGroupComponent = DynamicFormGroupComponent;
+    exports.DynamicFormInputComponent = DynamicFormInputComponent;
+    exports.DynamicFormModelComponent = DynamicFormModelComponent;
+    exports.DynamicFormSelectComponent = DynamicFormSelectComponent;
     exports.DynamicFormService = DynamicFormService;
+    exports.DynamicFormStaticComponent = DynamicFormStaticComponent;
+    exports.DynamicFormTemplateDirective = DynamicFormTemplateDirective;
+    exports.DynamicFormsComponent = DynamicFormsComponent;
+    exports.FORM_CONTROL_PROVIDER = FORM_CONTROL_PROVIDER;
+    exports.FormControlComponent = FormControlComponent;
+    exports.FormFieldSet = FormFieldSet;
     exports.FormFile = FormFile;
     exports.FormInput = FormInput;
     exports.FormModel = FormModel;
     exports.FormSelect = FormSelect;
-    exports.FormSelectSubject = FormSelectSubject;
     exports.FormSerializable = FormSerializable;
     exports.FormStatic = FormStatic;
-    exports.FormSubject = FormSubject;
+    exports.FormUtilities = FormUtilities;
     exports.NgxDynamicFormModule = NgxDynamicFormModule;
+    exports.OpenApiService = OpenApiService;
     exports.createFormControl = createFormControl;
     exports.createFormInput = createFormInput;
     exports.createFormModel = createFormModel;
@@ -1756,19 +2339,17 @@
     exports.defaultSerializer = defaultSerializer;
     exports.defineFormControl = defineFormControl;
     exports.getFormControl = getFormControl;
+    exports.getFormFieldSets = getFormFieldSets;
     exports.getFormSerializer = getFormSerializer;
-    exports.validateItemsMaxLength = validateItemsMaxLength;
-    exports.validateItemsMaxValue = validateItemsMaxValue;
-    exports.validateItemsMinLength = validateItemsMinLength;
-    exports.validateItemsMinValue = validateItemsMinValue;
-    exports.validateJSON = validateJSON;
-    exports.validatePhone = validatePhone;
-    exports.validateRequiredTranslation = validateRequiredTranslation;
-    exports.ɵa = components;
-    exports.ɵb = directives;
-    exports.ɵc = pipes;
+    exports.provideFormControl = provideFormControl;
+    exports.provideFormGroup = provideFormGroup;
+    exports["ɵa"] = FORM_GROUP_TYPE;
+    exports["ɵb"] = components;
+    exports["ɵc"] = directives;
+    exports["ɵd"] = pipes;
+    exports["ɵe"] = DynamicFormGroupDirective;
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
 //# sourceMappingURL=stemy-ngx-dynamic-form.umd.js.map