@stemy/ngx-dynamic-form 13.1.19 → 13.1.21

package/fesm2020/stemy-ngx-dynamic-form.mjs

@@ -4,11 +4,11 @@ import { __decorate } from 'tslib';
 import * as i1 from '@ng-dynamic-forms/core';
 import { DynamicInputControlModel, DYNAMIC_FORM_CONTROL_TYPE_EDITOR, serializable, DynamicFormArrayGroupModel as DynamicFormArrayGroupModel$1, DynamicFormArrayModel as DynamicFormArrayModel$1, DynamicFormOption as DynamicFormOption$1, DynamicSelectModel as DynamicSelectModel$1, DynamicFormService as DynamicFormService$1, DynamicDatePickerModel, DynamicFormGroupModel, DynamicInputModel, DynamicFormValueControlModel, DynamicFileUploadModel, DynamicCheckboxModel, DynamicTextAreaModel, DynamicFormComponent, DynamicTemplateDirective, DynamicFormControlContainerComponent, DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DynamicFormArrayComponent, DynamicFormControlComponent, DynamicFormGroupComponent, DYNAMIC_FORM_CONTROL_MAP_FN, DYNAMIC_VALIDATORS } from '@ng-dynamic-forms/core';
 export { DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX, DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX_GROUP, DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER, DYNAMIC_FORM_CONTROL_TYPE_EDITOR, DYNAMIC_FORM_CONTROL_TYPE_FILE_UPLOAD, DYNAMIC_FORM_CONTROL_TYPE_GROUP, DYNAMIC_FORM_CONTROL_TYPE_INPUT, DYNAMIC_FORM_CONTROL_TYPE_RADIO_GROUP, DYNAMIC_FORM_CONTROL_TYPE_SELECT, DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA, DynamicCheckboxGroupModel, DynamicCheckboxModel, DynamicDatePickerModel, DynamicFileUploadModel, DynamicFormControlComponent, DynamicFormGroupModel, DynamicFormsCoreModule, DynamicInputModel, DynamicListDirective, DynamicRadioGroupModel, DynamicTemplateDirective, DynamicTextAreaModel } from '@ng-dynamic-forms/core';
-import { BehaviorSubject, of, isObservable, map, Subject, firstValueFrom, Subscription, debounceTime as debounceTime$1, groupBy, mergeMap } from 'rxjs';
+import { BehaviorSubject, of, isObservable, Subject, firstValueFrom, Subscription } from 'rxjs';
+import { map, debounceTime, groupBy, mergeMap, first } from 'rxjs/operators';
 import * as i0 from '@angular/core';
 import { Injector, Injectable, Inject, EventEmitter, Directive, Input, Output, HostBinding, HostListener, QueryList, Component, ChangeDetectionStrategy, ContentChildren, ViewChildren, ViewContainerRef, ViewChild, forwardRef, NgModule } from '@angular/core';
 import { FormGroup, FormArray, FormsModule, ReactiveFormsModule, NG_VALIDATORS } from '@angular/forms';
-import { debounceTime, first } from 'rxjs/operators';
 import { CommonModule } from '@angular/common';
 
 // --- Decorator functions ---
@@ -626,7 +626,7 @@ class DynamicFormService extends DynamicFormService$1 {
     async getFormModelForSchema(name, customizeModel) {
         this.api.cache = {};
         this.schemas = await this.openApi.getSchemas();
-        const customizeModels = (property, schema, modelType, config) => {
+        const customizeModels = async (property, schema, modelType, config) => {
             const model = new modelType(config);
             if (model instanceof DynamicFormValueControlModel) {
                 model.value = (model instanceof DynamicDatePickerModel)
@@ -634,19 +634,25 @@ class DynamicFormService extends DynamicFormService$1 {
             }
             if (!ObjectUtils.isFunction(customizeModel))
                 return [model];
-            const res = customizeModel(property, schema, model, config, this.injector);
+            let res = customizeModel(property, schema, model, config, this.injector);
+            if (!res)
+                return [model];
+            if (res instanceof Promise) {
+                res = await res;
+            }
             return Array.isArray(res) ? res : [res];
         };
         return this.getFormModelForSchemaDef(this.schemas[name], customizeModels);
     }
-    getFormModelForSchemaDef(schema, customizeModels) {
+    async getFormModelForSchemaDef(schema, customizeModels) {
         if (!schema)
             return [];
         const keys = Object.keys(schema.properties || {});
         const controls = [];
         for (const p of keys) {
             const property = schema.properties[p];
-            controls.push(...this.getFormControlModels(property, schema, customizeModels));
+            const models = await this.getFormControlModels(property, schema, customizeModels);
+            controls.push(...models);
         }
         return controls.filter(t => null !== t);
     }
@@ -655,7 +661,7 @@ class DynamicFormService extends DynamicFormService$1 {
             return false;
         return EDITOR_FORMATS.indexOf(property.format) >= 0 || property.format.endsWith("script");
     }
-    getFormControlModels(property, schema, customizeModels) {
+    async getFormControlModels(property, schema, customizeModels) {
         const $enum = property.items?.enum || property.enum;
         if (Array.isArray($enum) || isStringWithVal(property.optionsPath) || isStringWithVal(property.endpoint)) {
             return customizeModels(property, schema, DynamicSelectModel, this.getFormSelectConfig(property, schema));
@@ -681,7 +687,7 @@ class DynamicFormService extends DynamicFormService$1 {
                 return customizeModels(property, schema, DynamicCheckboxModel, this.getFormCheckboxConfig(property, schema));
             case "array":
                 if (findRefs(property).length > 0) {
-                    return customizeModels(property, schema, DynamicFormArrayModel, this.getFormArrayConfig(property, schema, customizeModels));
+                    return customizeModels(property, schema, DynamicFormArrayModel, await this.getFormArrayConfig(property, schema, customizeModels));
                 }
                 else {
                     return customizeModels(property, schema, DynamicInputModel, this.getFormInputConfig(property, schema));
@@ -690,7 +696,7 @@ class DynamicFormService extends DynamicFormService$1 {
                 return customizeModels(property, schema, DynamicFileUploadModel, this.getFormUploadConfig(property, schema));
         }
         if (findRefs(property).length > 0) {
-            return customizeModels(property, schema, DynamicFormGroupModel, this.getFormGroupConfig(property, schema, customizeModels));
+            return customizeModels(property, schema, DynamicFormGroupModel, await this.getFormGroupConfig(property, schema, customizeModels));
         }
         return [];
     }
@@ -725,10 +731,11 @@ class DynamicFormService extends DynamicFormService$1 {
             additional: Object.assign({}, property)
         };
     }
-    getFormArrayConfig(property, schema, customizeModels) {
+    async getFormArrayConfig(property, schema, customizeModels) {
         const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
+        const subModels = await Promise.all(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)));
         return Object.assign(this.getFormControlConfig(property, schema), {
-            groupFactory: () => mergeFormModels(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels))),
+            groupFactory: () => mergeFormModels(ObjectUtils.copy(subModels)),
             initialCount: property.initialCount || 0,
             sortable: property.sortable || false,
             useTabs: property.useTabs || false,
@@ -740,10 +747,11 @@ class DynamicFormService extends DynamicFormService$1 {
             clearItems: property.clearItems !== false
         });
     }
-    getFormGroupConfig(property, schema, customizeModels) {
+    async getFormGroupConfig(property, schema, customizeModels) {
         const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
+        const subModels = await Promise.all(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)));
         return Object.assign(this.getFormControlConfig(property, schema), {
-            group: mergeFormModels(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)))
+            group: mergeFormModels(subModels)
         });
     }
     getFormInputConfig(property, schema) {
@@ -1134,10 +1142,10 @@ class DynamicBaseFormComponent extends DynamicFormComponent {
         if (this.group) {
             this.groupSubscription = ObservableUtils.multiSubscription(this.group.statusChanges.subscribe(() => {
                 this.onStatusChange.emit(this);
-            }), this.group.valueChanges.pipe(debounceTime$1(500)).subscribe(() => {
+            }), this.group.valueChanges.pipe(debounceTime(500)).subscribe(() => {
                 this.formService.notifyChanges(this.model, this.group);
             }), this.change.pipe(groupBy(ev => ev.model))
-                .pipe(mergeMap(t => t.pipe(debounceTime$1(500))))
+                .pipe(mergeMap(t => t.pipe(debounceTime(500))))
                 .subscribe(ev => {
                 this.onValueChange.emit({ ...ev, form: this });
             }));
@@ -1490,7 +1498,7 @@ class DynamicBaseFormControlComponent extends DynamicFormControlComponent {
         this.focus = new EventEmitter();
     }
     ngAfterViewInit() {
-        this.subscription = this.control.valueChanges.pipe(debounceTime$1(500)).subscribe(value => {
+        this.subscription = this.control.valueChanges.pipe(debounceTime(500)).subscribe(value => {
             this.onValueChanged(value);
         });
     }