npm - @stemy/ngx-dynamic-form - Versions diffs - 13.1.19 → 13.1.21 - Mend

@stemy/ngx-dynamic-form 13.1.19 → 13.1.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/fesm2015/stemy-ngx-dynamic-form.mjs CHANGED Viewed

@@ -4,11 +4,11 @@ import { __decorate, __awaiter } 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 ---
@@ -634,7 +634,7 @@ class DynamicFormService extends DynamicFormService$1 {
         return __awaiter(this, void 0, void 0, function* () {
             this.api.cache = {};
             this.schemas = yield this.openApi.getSchemas();
-            const customizeModels = (property, schema, modelType, config) => {
+            const customizeModels = (property, schema, modelType, config) => __awaiter(this, void 0, void 0, function* () {
                 const model = new modelType(config);
                 if (model instanceof DynamicFormValueControlModel) {
                     model.value = (model instanceof DynamicDatePickerModel)
@@ -642,22 +642,30 @@ 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 = yield res;
+                }
                 return Array.isArray(res) ? res : [res];
-            };
+            });
             return this.getFormModelForSchemaDef(this.schemas[name], customizeModels);
         });
     }
     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));
-        }
-        return controls.filter(t => null !== t);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!schema)
+                return [];
+            const keys = Object.keys(schema.properties || {});
+            const controls = [];
+            for (const p of keys) {
+                const property = schema.properties[p];
+                const models = yield this.getFormControlModels(property, schema, customizeModels);
+                controls.push(...models);
+            }
+            return controls.filter(t => null !== t);
+        });
     }
     checkIsEditorProperty(property) {
         if (!property.format)
@@ -666,43 +674,45 @@ class DynamicFormService extends DynamicFormService$1 {
     }
     getFormControlModels(property, schema, customizeModels) {
         var _a;
-        const $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, DynamicSelectModel, this.getFormSelectConfig(property, schema));
-        }
-        switch (property.type) {
-            case "string":
-            case "number":
-            case "integer":
-            case "textarea":
-                if (this.checkIsEditorProperty(property)) {
-                    return customizeModels(property, schema, DynamicEditorModel, this.getFormEditorConfig(property, schema));
-                }
-                if (property.format == "textarea") {
-                    return customizeModels(property, schema, DynamicTextAreaModel, this.getFormTextareaConfig(property, schema));
-                }
-                if (property.format == "date") {
-                    return customizeModels(property, schema, DynamicDatePickerModel, this.getFormDatepickerConfig(property, schema));
-                }
-                return customizeModels(property, schema, DynamicInputModel, this.getFormInputConfig(property, schema));
-            case "object":
-                return customizeModels(property, schema, DynamicEditorModel, this.getFormEditorConfig(property, schema));
-            case "boolean":
-                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));
-                }
-                else {
+        return __awaiter(this, void 0, void 0, function* () {
+            const $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, DynamicSelectModel, this.getFormSelectConfig(property, schema));
+            }
+            switch (property.type) {
+                case "string":
+                case "number":
+                case "integer":
+                case "textarea":
+                    if (this.checkIsEditorProperty(property)) {
+                        return customizeModels(property, schema, DynamicEditorModel, this.getFormEditorConfig(property, schema));
+                    }
+                    if (property.format == "textarea") {
+                        return customizeModels(property, schema, DynamicTextAreaModel, this.getFormTextareaConfig(property, schema));
+                    }
+                    if (property.format == "date") {
+                        return customizeModels(property, schema, DynamicDatePickerModel, this.getFormDatepickerConfig(property, schema));
+                    }
                     return customizeModels(property, schema, DynamicInputModel, this.getFormInputConfig(property, schema));
-                }
-            case "file":
-                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 [];
+                case "object":
+                    return customizeModels(property, schema, DynamicEditorModel, this.getFormEditorConfig(property, schema));
+                case "boolean":
+                    return customizeModels(property, schema, DynamicCheckboxModel, this.getFormCheckboxConfig(property, schema));
+                case "array":
+                    if (findRefs(property).length > 0) {
+                        return customizeModels(property, schema, DynamicFormArrayModel, yield this.getFormArrayConfig(property, schema, customizeModels));
+                    }
+                    else {
+                        return customizeModels(property, schema, DynamicInputModel, this.getFormInputConfig(property, schema));
+                    }
+                case "file":
+                    return customizeModels(property, schema, DynamicFileUploadModel, this.getFormUploadConfig(property, schema));
+            }
+            if (findRefs(property).length > 0) {
+                return customizeModels(property, schema, DynamicFormGroupModel, yield this.getFormGroupConfig(property, schema, customizeModels));
+            }
+            return [];
+        });
     }
     findModelByPath(parent, path) {
         if (path.length == 0)
@@ -736,24 +746,30 @@ class DynamicFormService extends DynamicFormService$1 {
         };
     }
     getFormArrayConfig(property, schema, customizeModels) {
-        const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
-        return Object.assign(this.getFormControlConfig(property, schema), {
-            groupFactory: () => mergeFormModels(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels))),
-            initialCount: property.initialCount || 0,
-            sortable: property.sortable || false,
-            useTabs: property.useTabs || false,
-            addItem: property.addItem !== false,
-            insertItem: property.insertItem !== false,
-            cloneItem: property.cloneItem !== false,
-            moveItem: property.moveItem !== false,
-            removeItem: property.removeItem !== false,
-            clearItems: property.clearItems !== false
+        return __awaiter(this, void 0, void 0, function* () {
+            const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
+            const subModels = yield Promise.all(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)));
+            return Object.assign(this.getFormControlConfig(property, schema), {
+                groupFactory: () => mergeFormModels(ObjectUtils.copy(subModels)),
+                initialCount: property.initialCount || 0,
+                sortable: property.sortable || false,
+                useTabs: property.useTabs || false,
+                addItem: property.addItem !== false,
+                insertItem: property.insertItem !== false,
+                cloneItem: property.cloneItem !== false,
+                moveItem: property.moveItem !== false,
+                removeItem: property.removeItem !== false,
+                clearItems: property.clearItems !== false
+            });
         });
     }
     getFormGroupConfig(property, schema, customizeModels) {
-        const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
-        return Object.assign(this.getFormControlConfig(property, schema), {
-            group: mergeFormModels(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)))
+        return __awaiter(this, void 0, void 0, function* () {
+            const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
+            const subModels = yield Promise.all(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)));
+            return Object.assign(this.getFormControlConfig(property, schema), {
+                group: mergeFormModels(subModels)
+            });
         });
     }
     getFormInputConfig(property, schema) {
@@ -1149,10 +1165,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(Object.assign(Object.assign({}, ev), { form: this }));
             }));
@@ -1515,7 +1531,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);
         });
     }