Fixes

Author: martijn00

README.md

@@ -84,7 +84,6 @@ Available built-in type validators include:
 - `FormBuilderValidators.hasUppercaseChars()` - requires the field's to contain a specified number of uppercase characters.
 - `FormBuilderValidators.hasLowercaseChars()` - requires the field's to contain a specified number of lowercase characters.
 - `FormBuilderValidators.hasNumericChars()` - requires the field's to contain a specified number of numeric characters.
-- `FormBuilderValidators.conditional()` - requires the field's to validate with another validator conditionally.
 - `FormBuilderValidators.alphabetical()` - requires the field's to contain only alphabetical characters.
 - `FormBuilderValidators.oddNumber()` - requires the field's to be an odd number.
 - `FormBuilderValidators.evenNumber()` - requires the field's to be an even number.

lib/src/form_builder_validators.dart

@@ -462,17 +462,24 @@ class FormBuilderValidators {
   /// * [errorText] is the error message to display when the CVC is invalid
   static FormFieldValidator<String> creditCardCVC({
     String? errorText,
-  }) =>
-      compose<String>(
-        [
-          minLength(3,
-              errorText: errorText ??
-                  FormBuilderLocalizations.current.creditCardCVCErrorText),
-          maxLength(4,
-              errorText: errorText ??
-                  FormBuilderLocalizations.current.creditCardCVCErrorText),
-        ],
-      );
+  }) {
+    return (valueCandidate) {
+      if (valueCandidate == null || valueCandidate.isEmpty) {
+        return errorText ??
+            FormBuilderLocalizations.current.creditCardCVCErrorText;
+      } else {
+        final cvc = int.tryParse(valueCandidate);
+        if (cvc == null ||
+            valueCandidate.length < 3 ||
+            valueCandidate.length > 4) {
+          return errorText ??
+              FormBuilderLocalizations.current.creditCardCVCErrorText;
+        } else {
+          return null;
+        }
+      }
+    };
+  }
 
   /// [FormFieldValidator] that requires the field's value to be a valid IP address.
   /// * [version] is a `String` or an `int`.
@@ -501,10 +508,11 @@ class FormBuilderValidators {
   static FormFieldValidator<String> time({
     String? errorText,
   }) =>
-      (valueCandidate) =>
-          valueCandidate?.isNotEmpty == true && !isDateTime(valueCandidate!)
-              ? errorText ?? FormBuilderLocalizations.current.timeErrorText
-              : null;
+      (valueCandidate) => valueCandidate == null ||
+              valueCandidate.isEmpty ||
+              !isTime(valueCandidate)
+          ? errorText ?? FormBuilderLocalizations.current.timeErrorText
+          : null;
 
   /// [FormFieldValidator] that requires the field's value to be a valid date.
   /// * [errorText] is the error message to display when the date is invalid

lib/src/utils/validators.dart

@@ -35,6 +35,9 @@ RegExp _macAddress = RegExp(r'^[0-9A-Fa-f]{2}$');
 
 RegExp _bic = RegExp(r'^[A-Z]{4}[A-Z]{2}\w{2}(\w{3})?$');
 
+RegExp _time = RegExp(
+    r'^(?:[01]\d|2[0-3]):[0-5]\d$|^(?:0?[1-9]|1[0-2]):[0-5]\d\s?(?:[AaPp][Mm])$');
+
 int _maxUrlLength = 2083;
 
 /// check if the string [str] is an email
@@ -258,6 +261,10 @@ bool isDateTime(String str) {
   }
 }
 
+bool isTime(String str) {
+  return _time.hasMatch(str);
+}
+
 /// check if the string is a valid phone number
 bool isPhoneNumber(String str) {
   if (str.isEmpty) {

test/form_builder_validators_test.dart

@@ -591,6 +591,30 @@ void main() {
     }),
   );
 
+  testWidgets(
+    'FormBuilderValidators.notMatch',
+    (WidgetTester tester) => testValidations(tester, (context) {
+      final validator = FormBuilderValidators.notMatch(r'^A[0-9]$');
+      // Pass
+      expect(validator('B1'), isNull);
+      expect(validator('C2'), isNull);
+      // Fail
+      expect(validator('A1'), isNotNull);
+      expect(validator('A9'), isNotNull);
+      expect(validator(null), isNull);
+      expect(validator(''), isNull);
+
+      final validatorWithErrorMessage = FormBuilderValidators.notMatch(
+        r'^A[0-9]$',
+        errorText: customErrorMessage,
+      );
+      // Pass
+      expect(validatorWithErrorMessage('B1'), isNull);
+      // Fail
+      expect(validatorWithErrorMessage('A1'), customErrorMessage);
+    }),
+  );
+
   testWidgets(
     'FormBuilderValidators.url',
     (WidgetTester tester) => testValidations(tester, (context) {
@@ -683,7 +707,11 @@ void main() {
       // Pass
       expect(validator('12:00'), isNull);
       expect(validator('23:59'), isNull);
+      expect(validator('12:00 AM'), isNull);
+      expect(validator('12:00 PM'), isNull);
+      expect(validator('11:59 PM'), isNull);
       // Fail
+      expect(validator('13:00 AM'), isNotNull);
       expect(validator('25:00'), isNotNull);
       expect(validator('invalid-time'), isNotNull);
       expect(validator(null), isNotNull);
@@ -833,7 +861,7 @@ void main() {
       // Pass
       expect(validatorWithErrorMessage('123'), isNull);
       // Fail
-      expect(validator('12'), customErrorMessage);
+      expect(validatorWithErrorMessage('12'), customErrorMessage);
     }),
   );