bugfix

artflutter · Jan 6, 2025 · 531a496 · 531a496
1 parent af1f11a
commit 531a496
Show file tree

Hide file tree

Showing 17 changed files with 378 additions and 33 deletions.
diff --git a/packages/generator_tests/test/doc/freezed_class_output_test.dart b/packages/generator_tests/test/doc/freezed_class_output_test.dart
@@ -34,6 +34,7 @@ void main() {
                 @RfControl(validators: [RequiredValidator()]) String? genderR, {
                 @RfControl() String? id,
                 @RfControl(validators: [RequiredValidator()]) String? idR,
+                @RfControl(validators: [RequiredValidator()]) @Default('') String idR2,
                 @RfControl<String>() String? name,
                 @JsonKey(name: 'logo_image') @RfControl<String>() String? logoImage,
                 @RfControl<double>() double? year,
@@ -287,6 +288,8 @@ class FreezedClassOForm
 
   static const String idRControlName = "idR";
 
+  static const String idR2ControlName = "idR2";
+
   static const String nameControlName = "name";
 
   static const String logoImageControlName = "logoImage";
@@ -307,6 +310,8 @@ class FreezedClassOForm
 
   String idRControlPath() => pathBuilder(idRControlName);
 
+  String idR2ControlPath() => pathBuilder(idR2ControlName);
+
   String nameControlPath() => pathBuilder(nameControlName);
 
   String logoImageControlPath() => pathBuilder(logoImageControlName);
@@ -321,6 +326,8 @@ class FreezedClassOForm
 
   String get _idRValue => idRControl.value as String;
 
+  String get _idR2Value => idR2Control.value as String;
+
   String? get _nameValue => nameControl?.value;
 
   String? get _logoImageValue => logoImageControl?.value;
@@ -363,6 +370,15 @@ class FreezedClassOForm
     }
   }
 
+  bool get containsIdR2 {
+    try {
+      form.control(idR2ControlPath());
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
   bool get containsName {
     try {
       form.control(nameControlPath());
@@ -398,6 +414,8 @@ class FreezedClassOForm
 
   Map<String, Object>? get idRErrors => idRControl.errors;
 
+  Map<String, Object> get idR2Errors => idR2Control.errors;
+
   Map<String, Object>? get nameErrors => nameControl?.errors;
 
   Map<String, Object>? get logoImageErrors => logoImageControl?.errors;
@@ -412,6 +430,8 @@ class FreezedClassOForm
 
   void get idRFocus => form.focus(idRControlPath());
 
+  void get idR2Focus => form.focus(idR2ControlPath());
+
   void get nameFocus => form.focus(nameControlPath());
 
   void get logoImageFocus => form.focus(logoImageControlPath());
@@ -636,6 +656,15 @@ class FreezedClassOForm
         updateParent: updateParent, emitEvent: emitEvent);
   }
 
+  void idR2ValueUpdate(
+    String value, {
+    bool updateParent = true,
+    bool emitEvent = true,
+  }) {
+    idR2Control.updateValue(value,
+        updateParent: updateParent, emitEvent: emitEvent);
+  }
+
   void nameValueUpdate(
     String? value, {
     bool updateParent = true,
@@ -699,6 +728,15 @@ class FreezedClassOForm
         updateParent: updateParent, emitEvent: emitEvent);
   }
 
+  void idR2ValuePatch(
+    String value, {
+    bool updateParent = true,
+    bool emitEvent = true,
+  }) {
+    idR2Control.patchValue(value,
+        updateParent: updateParent, emitEvent: emitEvent);
+  }
+
   void nameValuePatch(
     String? value, {
     bool updateParent = true,
@@ -786,6 +824,21 @@ class FreezedClassOForm
         disabled: disabled,
       );
 
+  void idR2ValueReset(
+    String value, {
+    bool updateParent = true,
+    bool emitEvent = true,
+    bool removeFocus = false,
+    bool? disabled,
+  }) =>
+      idR2Control.reset(
+        value: value,
+        updateParent: updateParent,
+        emitEvent: emitEvent,
+        removeFocus: removeFocus,
+        disabled: disabled,
+      );
+
   void nameValueReset(
     String? value, {
     bool updateParent = true,
@@ -844,6 +897,9 @@ class FreezedClassOForm
   FormControl<String> get idRControl =>
       form.control(idRControlPath()) as FormControl<String>;
 
+  FormControl<String> get idR2Control =>
+      form.control(idR2ControlPath()) as FormControl<String>;
+
   FormControl<String>? get nameControl => containsName
       ? form.control(nameControlPath()) as FormControl<String>?
       : null;
@@ -928,6 +984,24 @@ class FreezedClassOForm
     }
   }
 
+  void idR2SetDisabled(
+    bool disabled, {
+    bool updateParent = true,
+    bool emitEvent = true,
+  }) {
+    if (disabled) {
+      idR2Control.markAsDisabled(
+        updateParent: updateParent,
+        emitEvent: emitEvent,
+      );
+    } else {
+      idR2Control.markAsEnabled(
+        updateParent: updateParent,
+        emitEvent: emitEvent,
+      );
+    }
+  }
+
   void nameSetDisabled(
     bool disabled, {
     bool updateParent = true,
@@ -996,6 +1070,7 @@ class FreezedClassOForm
     return FreezedClassOOutput(_genderValue, _genderRValue,
         id: _idValue,
         idR: _idRValue,
+        idR2: _idR2Value,
         name: _nameValue,
         logoImage: _logoImageValue,
         year: _yearValue);
@@ -1116,6 +1191,13 @@ class FreezedClassOForm
             asyncValidatorsDebounceTime: 250,
             disabled: false,
             touched: false),
+        idR2ControlName: FormControl<String>(
+            value: freezedClassO?.idR2,
+            validators: [RequiredValidator()],
+            asyncValidators: [],
+            asyncValidatorsDebounceTime: 250,
+            disabled: false,
+            touched: false),
         nameControlName: FormControl<String>(
             value: freezedClassO?.name,
             validators: [],
@@ -1152,6 +1234,7 @@ class FreezedClassOOutput with _$FreezedClassOOutput {
       @RfControl(validators: [RequiredValidator()]) String genderR,
       {@RfControl() String? id,
       @RfControl(validators: [RequiredValidator()]) required String idR,
+      @RfControl(validators: [RequiredValidator()]) required String idR2,
       @RfControl<String>() String? name,
       @JsonKey(name: 'logo_image') @RfControl<String>() String? logoImage,
       @RfControl<double>() double? year}) = _FreezedClassOOutput;

diff --git a/packages/generator_tests/test/doc/login_output_test.dart b/packages/generator_tests/test/doc/login_output_test.dart
@@ -30,7 +30,17 @@ void main() {
               }
             }
             
-            @Rf(output: true)
+            class RequiredValidator2 extends RequiredValidator {
+              const RequiredValidator2() : super();
+            }
+            
+            @Rf(
+              output: true,
+              requiredValidators: [
+                ...defaultRequiredValidators,
+                'RequiredValidator2()',
+              ],
+            )
             @RfGroup(
               validators: [MustMatchValidator()],
             )
@@ -45,7 +55,7 @@ void main() {
                 )
                 this.email,
                 @RfControl(
-                  validators: [RequiredValidator()],
+                  validators: [RequiredValidator2()],
                 )
                 this.password,
               });
@@ -595,7 +605,7 @@ class LoginOForm implements FormModel<LoginO, LoginOOutput> {
             touched: false),
         passwordControlName: FormControl<String>(
             value: loginO?.password,
-            validators: [RequiredValidator()],
+            validators: [RequiredValidator2()],
             asyncValidators: [],
             asyncValidatorsDebounceTime: 250,
             disabled: false,
@@ -609,15 +619,17 @@ class LoginOForm implements FormModel<LoginO, LoginOOutput> {
           disabled: false);
 }
 
-@Rf(output: true)
+@Rf(
+    output: true,
+    requiredValidators: [...defaultRequiredValidators, 'RequiredValidator2()'])
 @RfGroup(validators: [MustMatchValidator()])
 class LoginOOutput extends Equatable {
   final String email;
   final String password;
   const LoginOOutput(
       {@RfControl(validators: [RequiredValidator(), RequiredValidator()])
       required this.email,
-      @RfControl(validators: [RequiredValidator()]) required this.password});
+      @RfControl(validators: [RequiredValidator2()]) required this.password});
   @override
   List<Object?> get props => [email, password];
 }

diff --git a/packages/reactive_forms_annotations/pubspec.yaml b/packages/reactive_forms_annotations/pubspec.yaml
@@ -2,7 +2,7 @@ name: reactive_forms_annotations
 description: Annotations for reactive_forms_generator
 repository: https://github.com/artflutter/reactive_forms_generator
 
-version: 6.0.0-beta.7
+version: 6.0.0-beta.8
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

diff --git a/packages/reactive_forms_generator/CHANGELOG.md b/packages/reactive_forms_generator/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [6.0.0-beta.24]
+
+* bugfix
+
+## [6.0.0-beta.23]
+
+* requiredValidators bugfix
+
 ## [6.0.0-beta.22]
 
 * requiredValidators

diff --git a/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class_output.dart b/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class_output.dart
@@ -18,6 +18,7 @@ class FreezedClassO with _$FreezedClassO {
     @RfControl(validators: [RequiredValidator()]) String? genderR, {
     @RfControl() String? id,
     @RfControl(validators: [RequiredValidator()]) String? idR,
+    @RfControl(validators: [RequiredValidator()]) @Default('') String idR2,
     @RfControl<String>() String? name,
     @JsonKey(name: 'logo_image') @RfControl<String>() String? logoImage,
     @RfControl<double>() double? year,