@stemy/ngx-dynamic-form 19.9.0 → 19.9.2

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

@@ -1,10 +1,10 @@
 import * as i2 from '@stemy/ngx-utils';
-import { cachedFactory, ReflectUtils, ObjectUtils, LANGUAGE_SERVICE, FactoryDependencies, ForbiddenZone, ArrayUtils, API_SERVICE, StringUtils, AsyncMethodBase, EventsService, NgxUtilsModule } from '@stemy/ngx-utils';
+import { cachedFactory, ReflectUtils, ObjectUtils, LANGUAGE_SERVICE, ForbiddenZone, ArrayUtils, API_SERVICE, StringUtils, AsyncMethodBase, EventsService, NgxUtilsModule } from '@stemy/ngx-utils';
 import { of, merge, Observable, firstValueFrom, BehaviorSubject, combineLatestWith, switchMap, distinctUntilChanged, first, Subject, filter } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { __decorate } from 'tslib';
 import * as i0 from '@angular/core';
-import { Inject, Injectable, untracked, input, inject, Renderer2, ElementRef, computed, signal, effect, HostBinding, Directive, Input, Pipe, Type, Component, output, Injector, ChangeDetectionStrategy, ViewEncapsulation, makeEnvironmentProviders, NgModule } from '@angular/core';
+import { inject, Inject, Injectable, untracked, input, Renderer2, ElementRef, computed, signal, effect, HostBinding, Directive, Input, Pipe, Type, Component, output, Injector, ChangeDetectionStrategy, ViewEncapsulation, makeEnvironmentProviders, NgModule } from '@angular/core';
 import * as i1 from '@angular/forms';
 import { FormGroup as FormGroup$1, FormArray as FormArray$1, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { outputToObservable, toSignal, rxResource, outputFromObservable } from '@angular/core/rxjs-interop';
@@ -431,9 +431,17 @@ function maxValueValidation(max, each) {
         return v == null || v <= max;
     }, "maxValue");
 }
+function setFieldMinDate(field, min) {
+    setFieldDefault(field, min);
+    setFieldProp(field, "min", min);
+    setFieldValue(field, min);
+    removeFieldValidators(field, "minValue");
+    addFieldValidators(field, [minValueValidation(min)]);
+}
 
 class ModelUtils {
-    static getLanguages(language) {
+    static getLanguages() {
+        const language = inject(LANGUAGE_SERVICE);
         return async () => {
             return language.languages.map(id => {
                 return { id, label: id };
@@ -441,9 +449,6 @@ class ModelUtils {
         };
     }
 }
-__decorate([
-    FactoryDependencies(LANGUAGE_SERVICE)
-], ModelUtils, "getLanguages", null);
 
 class RichTranslationModel {
     lang = "";
@@ -640,6 +645,23 @@ class DynamicFormBuilderService {
             return typeof itemType === "function" ? this.resolveFormFields(itemType, sp, options) : this.createFormInput("", typeof itemType === "string" ? { type: `${itemType}` } : itemType, sp, options);
         }, data, parent, options);
     }
+    createFieldSet(set, fields, parent, options) {
+        const id = !parent?.path ? set.id : `${parent.path}.${set.id}`;
+        return this.setExpressions({
+            id,
+            parent,
+            fieldGroup: fields,
+            wrappers: ["form-fieldset"],
+            props: {
+                label: this.getLabel(set.id, set.label, set.labelPrefix, parent, options, "title"),
+                hidden: false,
+                classes: toStringArray(set.classes),
+                layout: toStringArray(set.layout),
+            },
+            hooks: {},
+            expressions: {}
+        }, options);
+    }
     createFieldSets(fields, parent, options, sets = []) {
         const result = [];
         const groups = {};
@@ -656,27 +678,12 @@ class DynamicFormBuilderService {
             // If we have a fieldset name defined, then push the property fields into a group
             if (fsName) {
                 const id = !parent?.path ? fsName : `${parent.path}.${fsName}`;
-                const set = sets.find(s => s.id === fsName);
+                const set = sets.find(s => s.id === fsName) || { id: fsName, layout: "" };
                 let fieldGroup = groups[id];
                 if (!fieldGroup) {
                     fieldGroup = [];
-                    const fieldSet = {
-                        id,
-                        parent,
-                        fieldGroup,
-                        wrappers: ["form-fieldset"],
-                        props: {
-                            label: this.getLabel(fsName, set?.label, set?.labelPrefix, parent, options, "title"),
-                            hidden: false,
-                            classes: toStringArray(set?.classes),
-                            layout: toStringArray(set?.layout),
-                        },
-                        hooks: {},
-                        expressions: {}
-                    };
-                    this.setExpressions(fieldSet, options);
                     groups[id] = fieldGroup;
-                    result.push(fieldSet);
+                    result.push(this.createFieldSet(set, fieldGroup, parent, options));
                 }
                 fieldGroup.push(field);
                 continue;
@@ -995,7 +1002,10 @@ class DynamicFormBuilderService {
             configurable: true
         });
         // Set expressions
-        addFieldValidators(field, data.validators);
+        const validators = ObjectUtils.isArray(data.validators)
+            ? data.validators.map(v => ReflectUtils.resolve(v, this.injector))
+            : data.validators;
+        addFieldValidators(field, validators);
         this.setExpressions(field, options);
         return field;
     }
@@ -1054,6 +1064,7 @@ class DynamicFormBuilderService {
                 field[key] = expression(field);
             }
         });
+        return field;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.19", ngImport: i0, type: DynamicFormBuilderService, deps: [{ token: i0.Injector }, { token: i2.EventsService }, { token: API_SERVICE }, { token: LANGUAGE_SERVICE }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.19", ngImport: i0, type: DynamicFormBuilderService });
@@ -2324,5 +2335,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.19", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AsyncSubmitDirective, DynamicFieldType, DynamicFormAlertComponent, DynamicFormArrayComponent, DynamicFormBuilderService, DynamicFormChipsComponent, DynamicFormComponent, DynamicFormFieldComponent, DynamicFormFieldsetComponent, DynamicFormGroupComponent, DynamicFormSchemaService, DynamicFormService, DynamicFormStaticComponent, DynamicFormTemplateDirective, DynamicFormTemplatePipe, DynamicFormTemplateService, DynamicFormTranslationComponent, DynamicFormUploadComponent, DynamicFormWysiwygComponent, EDITOR_FORMATS, FORM_ROOT_ID, FormArray, FormFieldSet, FormGroup, FormInput, FormSelect, FormSerializable, FormStatic, FormUpload, MAX_INPUT_NUM, MIN_INPUT_NUM, NgxDynamicFormModule, RichTranslationModel, TranslationModel, addFieldValidators, arrayLengthValidation, clearFieldArray, controlStatus, controlValues, convertToDate, convertToDateFormat, convertToNumber, customizeFormField, emailValidation, getFieldByPath, getFieldsByKey, getFieldsByPredicate, getSelectOptions, insertToFieldArray, isFieldHidden, isFieldVisible, jsonValidation, maxLengthValidation, maxValueValidation, minLengthValidation, minValueValidation, phoneValidation, removeFieldValidators, removeFromFieldArray, replaceFieldArray, replaceSpecialChars, requiredValidation, setFieldDefault, setFieldDisabled, setFieldHidden, setFieldHooks, setFieldProp, setFieldProps, setFieldSerialize, setFieldValue, translationValidation };
+export { AsyncSubmitDirective, DynamicFieldType, DynamicFormAlertComponent, DynamicFormArrayComponent, DynamicFormBuilderService, DynamicFormChipsComponent, DynamicFormComponent, DynamicFormFieldComponent, DynamicFormFieldsetComponent, DynamicFormGroupComponent, DynamicFormSchemaService, DynamicFormService, DynamicFormStaticComponent, DynamicFormTemplateDirective, DynamicFormTemplatePipe, DynamicFormTemplateService, DynamicFormTranslationComponent, DynamicFormUploadComponent, DynamicFormWysiwygComponent, EDITOR_FORMATS, FORM_ROOT_ID, FormArray, FormFieldSet, FormGroup, FormInput, FormSelect, FormSerializable, FormStatic, FormUpload, MAX_INPUT_NUM, MIN_INPUT_NUM, NgxDynamicFormModule, RichTranslationModel, TranslationModel, addFieldValidators, arrayLengthValidation, clearFieldArray, controlStatus, controlValues, convertToDate, convertToDateFormat, convertToNumber, customizeFormField, emailValidation, getFieldByPath, getFieldsByKey, getFieldsByPredicate, getSelectOptions, insertToFieldArray, isFieldHidden, isFieldVisible, jsonValidation, maxLengthValidation, maxValueValidation, minLengthValidation, minValueValidation, phoneValidation, removeFieldValidators, removeFromFieldArray, replaceFieldArray, replaceSpecialChars, requiredValidation, setFieldDefault, setFieldDisabled, setFieldHidden, setFieldHooks, setFieldMinDate, setFieldProp, setFieldProps, setFieldSerialize, setFieldValue, translationValidation };
 //# sourceMappingURL=stemy-ngx-dynamic-form.mjs.map