@stemy/ngx-dynamic-form 19.9.31 → 19.9.33

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

@@ -40,10 +40,8 @@ function defineFormControl(target, propertyKey, cb) {
     const fields = ReflectUtils.getMetadata("dynamicFormFields", target) || new Set();
     const existing = ReflectUtils.getMetadata("dynamicFormField", target, propertyKey);
     const builder = (fb, opts, path) => {
-        const data = ObjectUtils.isFunction(existing) ? existing(fb, opts, path) : {
-            priority: Number.MAX_SAFE_INTEGER
-        };
-        return ObjectUtils.assign(data, cb(fb, opts, path) || {});
+        const data = ObjectUtils.isFunction(existing) ? existing(fb, opts, path) : {};
+        return ObjectUtils.assign(cb(fb, opts, path) || {}, data);
     };
     fields.add(propertyKey);
     ReflectUtils.defineMetadata("dynamicFormField", builder, target, propertyKey);
@@ -431,6 +429,8 @@ function maxLengthValidation(maxLength) {
 }
 function minValueValidation() {
     return validateEach((v, f) => {
+        if (v == null)
+            return true;
         const type = f.props.type || "number";
         const min = type.includes("date")
             ? convertToDate(f.props.min, type) : Number(f.props.min ?? 0);
@@ -438,11 +438,13 @@ function minValueValidation() {
             const date = new Date(v);
             return isNaN(date) || date >= min;
         }
-        return v == null || v >= min;
+        return v >= min;
     }, "minValue");
 }
 function maxValueValidation() {
     return validateEach((v, f) => {
+        if (v == null)
+            return true;
         const type = f.props.type || "number";
         const max = type.includes("date")
             ? convertToDate(f.props.max, type) : Number(f.props.max ?? 0);
@@ -450,7 +452,7 @@ function maxValueValidation() {
             const date = new Date(v);
             return isNaN(date) || date <= max;
         }
-        return v == null || v <= max;
+        return v <= max;
     }, "maxValue");
 }
 function enumValidation($enum) {
@@ -458,6 +460,11 @@ function enumValidation($enum) {
         return $enum.includes(v);
     }, "enum");
 }
+function equalsValidation(target) {
+    return validateEach(v => {
+        return v === target;
+    }, "equals");
+}
 function setFieldMinDate(field, min, setValue = true) {
     setFieldProp(field, "min", min);
     addFieldValidators(field, [minValueValidation()]);
@@ -805,7 +812,6 @@ class DynamicFormBuilderService {
                 setFieldProp(target, "options", options instanceof Observable
                     ? options
                     : controlValues(root).pipe(combineLatestWith(this.language), switchMap(async (a, b) => {
-                        console.log(a, b, "????", target.key, target.formControl?.value);
                         const results = await factory(target, this.injector) || [];
                         return this.fixSelectOptions(target, results);
                     })));
@@ -1206,6 +1212,12 @@ class DynamicFormSchemaService {
         return !field ? [] : options.customize(field, property, schema);
     }
     async getFormFieldForProp(property, options, parent) {
+        // First check property references, because a dynamic schema can be a type of object which we use for editor
+        const refs = await this.openApi.getReferences(property, options.schema);
+        if (refs.length > 0) {
+            return this.getFormGroupConfig(property, options, parent);
+        }
+        // Then check the property type
         switch (property.type) {
             case "object":
                 return this.getFormEditorConfig(property, options, parent);
@@ -1233,10 +1245,6 @@ class DynamicFormSchemaService {
         if (property.format == "date" || property.format == "date-time") {
             return this.getFormDatepickerConfig(property, options, parent);
         }
-        const refs = await this.openApi.getReferences(property, options.schema);
-        if (refs.length > 0) {
-            return this.getFormGroupConfig(property, options, parent);
-        }
         if (this.checkIsEditorProperty(property)) {
             return this.getFormEditorConfig(property, options, parent);
         }
@@ -1329,7 +1337,7 @@ class DynamicFormSchemaService {
                 break;
         }
         const sub = property.type == "array" ? property.items || property : property;
-        const input = this.builder.createFormInput(property.id, {
+        return this.builder.createFormInput(property.id, {
             ...this.getFormFieldData(property, options),
             type,
             autocomplete: property.autocomplete,
@@ -1343,7 +1351,6 @@ class DynamicFormSchemaService {
             indeterminate: property.indeterminate,
             suffix: property.suffix
         }, parent, options);
-        return input;
     }
     getFormTextareaConfig(property, options, parent) {
         return this.builder.createFormInput(property.id, {
@@ -1529,6 +1536,9 @@ class DynamicFormSchemaService {
         if (Array.isArray(property.enum)) {
             validators.enum = enumValidation(property.enum);
         }
+        if ("equals" in property) {
+            validators.equals = equalsValidation(property.equals);
+        }
         // if (isString(property.pattern) && property.pattern.length) {
         //     validators.pattern = property.pattern;
         // }
@@ -1556,6 +1566,9 @@ class DynamicFormSchemaService {
         if (Array.isArray(items.enum)) {
             validators.enum = enumValidation(items.enum);
         }
+        if ("equals" in items) {
+            validators.equals = equalsValidation(items.equals);
+        }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.22", ngImport: i0, type: DynamicFormSchemaService, deps: [{ token: i2.OpenApiService }, { token: i0.Injector }, { token: DynamicFormBuilderService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.22", ngImport: i0, type: DynamicFormSchemaService }); }
@@ -2498,5 +2511,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.22", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AsyncSubmitDirective, DEFAULT_NUMERIC_STEP, DynamicFieldType, DynamicFormAlertComponent, DynamicFormArrayComponent, DynamicFormBuilderService, DynamicFormChipsComponent, DynamicFormComponent, DynamicFormEditorComponent, DynamicFormFieldComponent, DynamicFormFieldsetComponent, DynamicFormGroupComponent, DynamicFormPasswordComponent, DynamicFormSchemaService, DynamicFormService, DynamicFormStaticComponent, DynamicFormTemplateDirective, DynamicFormTemplatePipe, DynamicFormTemplateService, DynamicFormTranslationComponent, DynamicFormUploadComponent, DynamicFormWysiwygComponent, EDITOR_TYPES, 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, enumValidation, 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 };
+export { AsyncSubmitDirective, DEFAULT_NUMERIC_STEP, DynamicFieldType, DynamicFormAlertComponent, DynamicFormArrayComponent, DynamicFormBuilderService, DynamicFormChipsComponent, DynamicFormComponent, DynamicFormEditorComponent, DynamicFormFieldComponent, DynamicFormFieldsetComponent, DynamicFormGroupComponent, DynamicFormPasswordComponent, DynamicFormSchemaService, DynamicFormService, DynamicFormStaticComponent, DynamicFormTemplateDirective, DynamicFormTemplatePipe, DynamicFormTemplateService, DynamicFormTranslationComponent, DynamicFormUploadComponent, DynamicFormWysiwygComponent, EDITOR_TYPES, 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, enumValidation, equalsValidation, 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