More

Author: martijn00

lib/src/form_builder_validators.dart

@@ -382,26 +382,28 @@ class FormBuilderValidators {
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) =>
-          valueCandidate?.isNotEmpty == true && !regex.hasMatch(valueCandidate!)
-              ? errorText ?? FormBuilderLocalizations.current.matchErrorText
-              : null;
+      MatchValidator(
+        regex,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value not to match the provided regex pattern.
   /// This validator checks if the field's value does not match the given regex pattern.
   ///
   /// ## Parameters:
   /// - [regex] The regex pattern to match.
   /// - [errorText] The error message to display when the value matches the pattern.
-  static FormFieldValidator<String> notMatch(
+  static FormFieldValidator<String> matchNot(
     RegExp regex, {
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) =>
-          valueCandidate?.isNotEmpty == true && regex.hasMatch(valueCandidate!)
-              ? errorText ?? FormBuilderLocalizations.current.matchErrorText
-              : null;
+      MatchNotValidator(
+        regex,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be a valid number.
   /// This validator checks if the field's value is a valid number.
@@ -915,32 +917,32 @@ class FormBuilderValidators {
         FormBuilderValidators.minLength(minLength, errorText: errorText),
         FormBuilderValidators.maxLength(maxLength, errorText: errorText),
         if (!allowNumbers)
-          FormBuilderValidators.notMatch(
+          FormBuilderValidators.matchNot(
             RegExp('[0-9]'),
             errorText: errorText,
           ),
         if (!allowUnderscore)
-          FormBuilderValidators.notMatch(
+          FormBuilderValidators.matchNot(
             RegExp('_'),
             errorText: errorText,
           ),
         if (!allowDots)
-          FormBuilderValidators.notMatch(
+          FormBuilderValidators.matchNot(
             RegExp(r'\.'),
             errorText: errorText,
           ),
         if (!allowDash)
-          FormBuilderValidators.notMatch(
+          FormBuilderValidators.matchNot(
             RegExp('-'),
             errorText: errorText,
           ),
         if (!allowSpace)
-          FormBuilderValidators.notMatch(
+          FormBuilderValidators.matchNot(
             RegExp(r'\s'),
             errorText: errorText,
           ),
         if (!allowSpecialChar)
-          FormBuilderValidators.notMatch(
+          FormBuilderValidators.matchNot(
             RegExp(r'[!@#\$%^&*(),.?":{}|<>]'),
             errorText: errorText,
           ),
@@ -1314,8 +1316,8 @@ class FormBuilderValidators {
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) => valueCandidate?.isEmpty != false ||
-              !isSingleLine(valueCandidate!)
-          ? errorText ?? FormBuilderLocalizations.current.singleLineErrorText
-          : null;
+      SingleLineValidator(
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 }

lib/src/string/match_not_validator.dart

@@ -1,2 +1,24 @@
 import '../../localization/l10n.dart';
 import '../base_validator.dart';
+
+class MatchNotValidator extends BaseValidator<String> {
+  const MatchNotValidator(
+    this.regex, {
+    /// {@macro base_validator_error_text}
+    super.errorText,
+
+    /// {@macro base_validator_null_check}
+    super.checkNullOrEmpty,
+  });
+
+  final RegExp regex;
+
+  @override
+  String get translatedErrorText =>
+      FormBuilderLocalizations.current.matchErrorText;
+
+  @override
+  String? validateValue(String? valueCandidate) {
+    return regex.hasMatch(valueCandidate!) ? null : errorText;
+  }
+}

lib/src/string/match_validator.dart

@@ -1,2 +1,24 @@
 import '../../localization/l10n.dart';
 import '../base_validator.dart';
+
+class MatchValidator extends BaseValidator<String> {
+  const MatchValidator(
+    this.regex, {
+    /// {@macro base_validator_error_text}
+    super.errorText,
+
+    /// {@macro base_validator_null_check}
+    super.checkNullOrEmpty,
+  });
+
+  final RegExp regex;
+
+  @override
+  String get translatedErrorText =>
+      FormBuilderLocalizations.current.matchErrorText;
+
+  @override
+  String? validateValue(String? valueCandidate) {
+    return !regex.hasMatch(valueCandidate!) ? null : errorText;
+  }
+}

lib/src/string/single_line_validator.dart

@@ -1,2 +1,23 @@
 import '../../localization/l10n.dart';
 import '../base_validator.dart';
+
+class SingleLineValidator extends BaseValidator<String> {
+  const SingleLineValidator({
+    /// {@macro base_validator_error_text}
+    super.errorText,
+
+    /// {@macro base_validator_null_check}
+    super.checkNullOrEmpty,
+  });
+
+  @override
+  String get translatedErrorText =>
+      FormBuilderLocalizations.current.singleLineErrorText;
+
+  @override
+  String? validateValue(String? valueCandidate) {
+    return !valueCandidate!.contains('\n') && !valueCandidate.contains('\r')
+        ? errorText
+        : null;
+  }
+}

lib/src/utils/validators.dart

@@ -285,7 +285,3 @@ bool isBIC(String bic) {
 
   return _bic.hasMatch(bic);
 }
-
-bool isSingleLine(String value) {
-  return !value.contains('\n') && !value.contains('\r');
-}

test/src/form_builder_validators_test.dart

@@ -685,7 +685,7 @@ void main() {
     'FormBuilderValidators.notMatch',
     (WidgetTester tester) => testValidations(tester, (BuildContext context) {
       final FormFieldValidator<String> validator =
-          FormBuilderValidators.notMatch(RegExp(r'^A[0-9]$'));
+          FormBuilderValidators.matchNot(RegExp(r'^A[0-9]$'));
       // Pass
       expect(validator('B1'), isNull);
       expect(validator('C2'), isNull);
@@ -696,7 +696,7 @@ void main() {
       expect(validator(''), isNull);
 
       final FormFieldValidator<String> validatorWithErrorMessage =
-          FormBuilderValidators.notMatch(
+          FormBuilderValidators.matchNot(
         RegExp(r'^A[0-9]$'),
         errorText: customErrorMessage,
       );