@stemy/ngx-dynamic-form 19.0.9 → 19.1.1

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

@@ -7,7 +7,7 @@ import { __decorate } from 'tslib';
 import { BehaviorSubject, isObservable, of, Subject, firstValueFrom, Subscription } from 'rxjs';
 import { map, debounceTime, first, groupBy, mergeMap } 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, Optional, NgModule } from '@angular/core';
+import { Injector, Injectable, Inject, EventEmitter, Directive, Input, Output, HostBinding, HostListener, QueryList, Component, ChangeDetectionStrategy, ContentChildren, ViewChildren, ViewContainerRef, ViewChild, forwardRef, Optional, makeEnvironmentProviders, NgModule } from '@angular/core';
 import { FormGroup, FormArray, FormsModule, ReactiveFormsModule, NG_VALIDATORS } from '@angular/forms';
 import { CommonModule } from '@angular/common';
 
@@ -541,24 +541,43 @@ class DynamicFormService extends DynamicFormService$1 {
         this.openApi = openApi;
         this.injector = injector;
     }
+    async serializeForm(form, validate) {
+        if (!form.group)
+            return null;
+        if (validate) {
+            await this.validateForm(form);
+        }
+        return this.serialize(form.model, form.group);
+    }
+    async getFormModelForSchema(name, customizeOrOptions) {
+        return (await this.getFormGroupModelForSchema(name, customizeOrOptions)).group;
+    }
+    getErrors(form) {
+        this.showErrors(form);
+        return new Promise(resolve => {
+            setTimeout(() => {
+                resolve(getFormValidationErrors(form.group.controls, ""));
+            }, 500);
+        });
+    }
     createFormGroup(formModel, options, parent) {
         const group = super.createFormGroup(formModel, options, parent);
         if (!parent) {
             group.valueChanges.pipe(debounceTime(500)).subscribe(() => {
-                this.notifyChanges(formModel, group);
+                this.notifyChanges(formModel, group, formModel);
             });
         }
         return group;
     }
     patchGroup(value, formModel, formGroup) {
         value = ObjectUtils.copy(value);
-        this.patchValueRecursive(value, formModel, formGroup);
+        this.patchValues(value, formModel, formGroup);
         formGroup.patchValue(value);
         this.detectChanges();
     }
     patchForm(value, component) {
         value = ObjectUtils.copy(value);
-        this.patchValueRecursive(value, component.model, component.group);
+        this.patchValues(value, component.model, component.group);
         component.group.patchValue(value);
         this.detectChanges(component);
     }
@@ -580,68 +599,7 @@ class DynamicFormService extends DynamicFormService$1 {
             form.group.updateValueAndValidity();
         });
     }
-    async serializeForm(form, validate) {
-        if (!form.group)
-            return null;
-        if (validate) {
-            await this.validateForm(form);
-        }
-        return this.serialize(form.model, form.group);
-    }
-    serialize(formModel, formGroup) {
-        return this.serializeRecursive(formModel, formGroup);
-    }
-    notifyChanges(formModel, formGroup) {
-        this.notifyChangesRecursive(formModel, formGroup, formModel);
-    }
-    showErrors(form) {
-        this.showErrorsForGroup(form.group);
-        this.detectChanges(form);
-    }
-    getErrors(form) {
-        this.showErrors(form);
-        return new Promise(resolve => {
-            setTimeout(() => {
-                resolve(getFormValidationErrors(form.group.controls, ""));
-            }, 500);
-        });
-    }
-    patchValueRecursive(value, formModel, formGroup) {
-        if (!value)
-            return;
-        formModel?.forEach(subModel => {
-            const key = subModel.id;
-            const subValue = value[key];
-            const subControl = this.findControlByModel(subModel, formGroup);
-            if (subModel instanceof DynamicSelectModel && ObjectUtils.isObject(subValue)) {
-                value[key] = subValue.id || subValue._id || subValue;
-                return;
-            }
-            if (subModel instanceof DynamicDatePickerModel) {
-                value[key] = this.convertToDate(subValue);
-                return;
-            }
-            if (subModel instanceof DynamicFormArrayModel) {
-                const length = Array.isArray(subValue) ? subValue.length : 0;
-                const subArray = subControl;
-                while (subModel.size > length) {
-                    this.removeFormArrayGroup(0, subArray, subModel);
-                }
-                while (subModel.size < length) {
-                    this.insertFormArrayGroup(subModel.size, subArray, subModel);
-                }
-                for (let i = 0; i < length; i++) {
-                    const itemModel = subModel.get(i);
-                    this.patchValueRecursive(subValue[i], itemModel.group, subArray.at(i));
-                }
-                return;
-            }
-            if (subModel instanceof DynamicFormGroupModel) {
-                this.patchValueRecursive(subValue, subModel.group, subControl);
-            }
-        });
-    }
-    async serializeRecursive(formModel, formGroup) {
+    async serialize(formModel, formGroup) {
         const result = {};
         if (!formModel || !formGroup || !formGroup.value)
             return result;
@@ -661,7 +619,7 @@ class DynamicFormService extends DynamicFormService$1 {
                 const resArray = [];
                 for (let i = 0; i < length; i++) {
                     const itemModel = subModel.get(i);
-                    resArray.push(await this.serializeRecursive(itemModel.group, subArray.at(i)));
+                    resArray.push(await this.serialize(itemModel.group, subArray.at(i)));
                 }
                 result[subModel.id] = resArray;
                 continue;
@@ -673,14 +631,18 @@ class DynamicFormService extends DynamicFormService$1 {
                 continue;
             }
             if (subModel instanceof DynamicFormGroupModel) {
-                result[subModel.id] = await this.serializeRecursive(subModel.group, subControl);
+                result[subModel.id] = await this.serialize(subModel.group, subControl);
                 continue;
             }
             result[subModel.id] = subControl.value;
         }
         return result;
     }
-    notifyChangesRecursive(formModel, formGroup, root) {
+    showErrors(form) {
+        this.showErrorsForGroup(form.group);
+        this.detectChanges(form);
+    }
+    notifyChanges(formModel, formGroup, root) {
         if (!formModel || !formGroup)
             return;
         for (const i in formModel) {
@@ -691,17 +653,52 @@ class DynamicFormService extends DynamicFormService$1 {
                 const subArray = subControl;
                 for (let i = 0; i < length; i++) {
                     const itemModel = subModel.get(i);
-                    this.notifyChangesRecursive(itemModel.group, subArray.at(i), root);
+                    this.notifyChanges(itemModel.group, subArray.at(i), root);
                 }
                 continue;
             }
             if (subModel instanceof DynamicFormGroupModel) {
-                this.notifyChangesRecursive(subModel.group, subControl, root);
+                this.notifyChanges(subModel.group, subControl, root);
                 continue;
             }
             this.updateSelectOptions(subModel, subControl, root);
         }
     }
+    patchValues(value, formModel, formGroup) {
+        if (!value)
+            return;
+        formModel?.forEach(subModel => {
+            const key = subModel.id;
+            const subValue = value[key];
+            const subControl = this.findControlByModel(subModel, formGroup);
+            if (subModel instanceof DynamicSelectModel && ObjectUtils.isObject(subValue)) {
+                value[key] = subValue.id || subValue._id || subValue;
+                return;
+            }
+            if (subModel instanceof DynamicDatePickerModel) {
+                value[key] = this.convertToDate(subValue);
+                return;
+            }
+            if (subModel instanceof DynamicFormArrayModel) {
+                const length = Array.isArray(subValue) ? subValue.length : 0;
+                const subArray = subControl;
+                while (subModel.size > length) {
+                    this.removeFormArrayGroup(0, subArray, subModel);
+                }
+                while (subModel.size < length) {
+                    this.insertFormArrayGroup(subModel.size, subArray, subModel);
+                }
+                for (let i = 0; i < length; i++) {
+                    const itemModel = subModel.get(i);
+                    this.patchValues(subValue[i], itemModel.group, subArray.at(i));
+                }
+                return;
+            }
+            if (subModel instanceof DynamicFormGroupModel) {
+                this.patchValues(subValue, subModel.group, subControl);
+            }
+        });
+    }
     updateSelectOptions(formControlModel, formControl, root) {
         if (formControlModel instanceof DynamicSelectModel) {
             let options = formControlModel.options$;
@@ -744,14 +741,17 @@ class DynamicFormService extends DynamicFormService$1 {
             : new Date(value);
         return isNaN(date) ? new Date() : date;
     }
-    async getFormModelForSchema(name, customizeModel) {
-        return (await this.getFormGroupModelForSchema(name, customizeModel)).group;
-    }
-    async getFormGroupModelForSchema(name, customizeModel) {
+    async getFormGroupModelForSchema(name, customizeOrOptions) {
         this.api.cache = {};
         this.schemas = await this.openApi.getSchemas();
         const fieldSets = [];
+        const options = ObjectUtils.isObject(customizeOrOptions) ? customizeOrOptions : {};
+        const customizeModel = ObjectUtils.isFunction(customizeOrOptions)
+            ? customizeOrOptions : options.customizer;
         const customizeModels = async (property, schema, modelType, config) => {
+            config.label = !config.label || !options.labelPrefix
+                ? config.label || ""
+                : await this.language.getTranslation(`${options.labelPrefix}.${config.label}`);
             const model = new modelType(config);
             if (model instanceof DynamicFormValueControlModel) {
                 model.value = (model instanceof DynamicDatePickerModel)
@@ -1044,7 +1044,7 @@ class DynamicFormService extends DynamicFormService$1 {
         return new FormSelectSubject(async (selectModel, control) => {
             const entries = Object.entries(control.root?.controls || {});
             const endpoint = entries.reduce((res, [key, control]) => {
-                return res.replace(new RegExp(`\\$${key}`, "gi"), `${control?.value ?? ""}`);
+                return this.replaceOptionsEndpoint(res, key, control?.value);
             }, `${property.endpoint}`);
             this.api.cache[endpoint] = this.api.cache[endpoint] || this.api.list(endpoint, this.api.makeListParams(1, -1)).then(result => {
                 const items = ObjectUtils.isArray(result)
@@ -1095,6 +1095,19 @@ class DynamicFormService extends DynamicFormService$1 {
         this.patchGroup(formArray.at(index + 1).value, formArrayModel.groups[index].group, formArray.at(index));
         formArrayModel.filterGroups();
     }
+    replaceOptionsEndpoint(endpoint, key, value) {
+        if (ObjectUtils.isObject(value)) {
+            return Object.entries(value).reduce((res, [k, v]) => {
+                return this.replaceOptionsEndpoint(res, `${key}.${k}`, v);
+            }, endpoint);
+        }
+        if (ObjectUtils.isArray(value)) {
+            return value.reduce((res, v, i) => {
+                return this.replaceOptionsEndpoint(res, `${key}.${i}`, v);
+            }, endpoint);
+        }
+        return endpoint.replace(new RegExp(`\\$${key}`, "gi"), `${value ?? ""}`);
+    }
     async fixSelectOptions(model, control, options) {
         if (!options)
             return [];
@@ -1347,7 +1360,7 @@ class DynamicBaseFormComponent extends DynamicFormComponent {
                 this.templates.reset(templates);
             }
         }), this.events.languageChanged.subscribe(() => {
-            this.formService.notifyChanges(this.model, this.group);
+            this.formService.notifyChanges(this.model, this.group, this.model);
             this.formService.detectChanges(this);
         }));
     }
@@ -1902,23 +1915,29 @@ function defaultFormControlProvider() {
 }
 
 class NgxDynamicFormModule {
+    static getProviders(config) {
+        return [
+            DynamicFormService,
+            {
+                provide: DynamicFormService$1,
+                useExisting: DynamicFormService
+            },
+            {
+                provide: DYNAMIC_FORM_CONTROL_MAP_FN,
+                useFactory: (config?.controlProvider || defaultFormControlProvider),
+                deps: [Injector]
+            }
+        ];
+    }
     static forRoot(config) {
         return {
             ngModule: NgxDynamicFormModule,
-            providers: [
-                DynamicFormService,
-                {
-                    provide: DynamicFormService$1,
-                    useExisting: DynamicFormService
-                },
-                {
-                    provide: DYNAMIC_FORM_CONTROL_MAP_FN,
-                    useFactory: (config?.controlProvider || defaultFormControlProvider),
-                    deps: [Injector]
-                }
-            ]
+            providers: NgxDynamicFormModule.getProviders(config)
         };
     }
+    static provideForms(config) {
+        return makeEnvironmentProviders(NgxDynamicFormModule.getProviders(config));
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: NgxDynamicFormModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
     static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.0.3", ngImport: i0, type: NgxDynamicFormModule, declarations: [DynamicBaseFormComponent, DynamicBaseFormArrayComponent, DynamicBaseFormControlComponent, DynamicBaseFormControlContainerComponent, DynamicBaseFormGroupComponent, DynamicBaseSelectComponent, AsyncSubmitDirective], imports: [CommonModule,
             FormsModule,