More

Author: martijn00

lib/src/bool/has_lowercase_chars_validator.dart

@@ -4,6 +4,8 @@ import '../base_validator.dart';
 class HasLowercaseCharsValidator extends BaseValidator<String> {
   HasLowercaseCharsValidator({
     this.atLeast = 1,
+
+    /// {@macro lower_case_template}
     RegExp? regex,
 
     /// {@macro base_validator_error_text}

lib/src/bool/has_numeric_chars_validator.dart

@@ -4,6 +4,8 @@ import '../base_validator.dart';
 class HasNumericCharsValidator extends BaseValidator<String> {
   HasNumericCharsValidator({
     this.atLeast = 1,
+
+    /// {@macro numeric_chars_template}
     RegExp? regex,
 
     /// {@macro base_validator_error_text}
@@ -21,7 +23,7 @@ class HasNumericCharsValidator extends BaseValidator<String> {
   String get translatedErrorText =>
       FormBuilderLocalizations.current.containsNumberErrorText(atLeast);
 
-  /// {@template number_template}
+  /// {@template numeric_chars_template}
   /// This regex matches any character that is not a digit (0-9).
   ///
   /// - It includes special characters, letters, and other non-numeric characters.

lib/src/bool/has_special_chars_validator.dart

@@ -4,6 +4,8 @@ import '../base_validator.dart';
 class HasSpecialCharsValidator extends BaseValidator<String> {
   HasSpecialCharsValidator({
     this.atLeast = 1,
+
+    /// {@macro special_chars_template}
     RegExp? regex,
 
     /// {@macro base_validator_error_text}
@@ -21,7 +23,7 @@ class HasSpecialCharsValidator extends BaseValidator<String> {
   String get translatedErrorText =>
       FormBuilderLocalizations.current.containsSpecialCharErrorText(atLeast);
 
-  /// {@template special_char_template}
+  /// {@template special_chars_template}
   /// This regex matches any character that is not a letter (A-Z, a-z) or a digit (0-9).
   ///
   /// - It includes special characters and symbols.

lib/src/bool/has_uppercase_chars_validator.dart

@@ -4,6 +4,8 @@ import '../base_validator.dart';
 class HasUppercaseCharsValidator extends BaseValidator<String> {
   HasUppercaseCharsValidator({
     this.atLeast = 1,
+
+    /// {@macro upper_case_template}
     RegExp? regex,
 
     /// {@macro base_validator_error_text}

lib/src/datetime/time_validator.dart

@@ -3,6 +3,7 @@ import '../base_validator.dart';
 
 class TimeValidator extends BaseValidator<String> {
   TimeValidator({
+    /// {@macro time_template}
     RegExp? regex,
 
     /// {@macro base_validator_error_text}

lib/src/file/path_validator.dart

@@ -3,6 +3,7 @@ import '../base_validator.dart';
 
 class PathValidator extends BaseValidator<String?> {
   PathValidator({
+    /// {@macro file_path_template}
     RegExp? regex,
 
     /// {@macro base_validator_error_text}

lib/src/form_builder_validators.dart

@@ -331,21 +331,21 @@ class FormBuilderValidators {
     bool allowUnderscore = false,
     List<String> hostWhitelist = const <String>[],
     List<String> hostBlacklist = const <String>[],
+    RegExp? regex,
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) => valueCandidate?.isNotEmpty == true &&
-              !isURL(
-                valueCandidate,
-                protocols: protocols,
-                requireTld: requireTld,
-                requireProtocol: requireProtocol,
-                allowUnderscore: allowUnderscore,
-                hostWhitelist: hostWhitelist,
-                hostBlacklist: hostBlacklist,
-              )
-          ? errorText ?? FormBuilderLocalizations.current.urlErrorText
-          : null;
+      UrlValidator(
+        protocols: protocols,
+        requireTld: requireTld,
+        requireProtocol: requireProtocol,
+        allowUnderscore: allowUnderscore,
+        hostWhitelist: hostWhitelist,
+        hostBlacklist: hostBlacklist,
+        regex: regex,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to match the provided regex pattern.
   /// This validator checks if the field's value matches the given regex pattern.
@@ -611,17 +611,15 @@ class FormBuilderValidators {
   ///
   /// {@macro phone_number_template}
   static FormFieldValidator<String> phoneNumber({
+    RegExp? regex,
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) {
-        if (valueCandidate == null || valueCandidate.isEmpty) {
-          return errorText ?? FormBuilderLocalizations.current.phoneErrorText;
-        }
-        return !isPhoneNumber(valueCandidate)
-            ? errorText ?? FormBuilderLocalizations.current.phoneErrorText
-            : null;
-      };
+      PhoneNumberValidator(
+        regex: regex,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be a valid color code.
   /// This validator checks if the field's value is a valid color code.
@@ -1155,13 +1153,15 @@ class FormBuilderValidators {
   ///
   /// {@macro mac_address_template}
   static FormFieldValidator<String> macAddress({
+    RegExp? regex,
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) => valueCandidate?.isEmpty != false ||
-              !isMACAddress(valueCandidate!)
-          ? errorText ?? FormBuilderLocalizations.current.macAddressErrorText
-          : null;
+      MacAddressValidator(
+        regex: regex,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to start with a specific value.
   /// This validator checks if the field's value starts with the given prefix.

lib/src/network/email_validator.dart

@@ -14,6 +14,7 @@ import '../base_validator.dart';
 /// {@endtemplate}
 class EmailValidator extends BaseValidator<String> {
   EmailValidator({
+    /// {@macro email_regex_template}
     RegExp? regex,
 
     /// {@macro base_validator_error_text}

lib/src/network/ip_validator.dart

@@ -4,6 +4,9 @@ import '../base_validator.dart';
 class IpValidator extends BaseValidator<String?> {
   IpValidator({
     int this.version = 4,
+
+    /// {@macro ipv4_template}
+    /// {@macro ipv6_template}
     RegExp? this.regex,
 
     /// {@macro base_validator_error_text}

lib/src/network/mac_address_validator.dart

@@ -1,2 +1,53 @@
 import '../../localization/l10n.dart';
 import '../base_validator.dart';
+
+class MacAddressValidator extends BaseValidator<String?> {
+  MacAddressValidator({
+    /// {@macro mac_address_template}
+    RegExp? regex,
+
+    /// {@macro base_validator_error_text}
+    super.errorText,
+
+    /// {@macro base_validator_null_check}
+    super.checkNullOrEmpty,
+  }) : regex = regex ?? _macAddress;
+
+  final RegExp regex;
+
+  /// {@template mac_address_template}
+  /// This regex matches MAC addresses.
+  ///
+  /// - It consists of six groups of two hexadecimal digits.
+  /// - Each group is separated by a colon.
+  ///
+  /// Examples: 00:1A:2B:3C:4D:5E, 00:1A:2B:3C:4D:5E
+  /// {@endtemplate}
+  static final RegExp _macAddress =
+      RegExp(r'^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$');
+
+  @override
+  String get translatedErrorText =>
+      FormBuilderLocalizations.current.macAddressErrorText;
+
+  @override
+  String? validateValue(String? valueCandidate) {
+    return !isMACAddress(valueCandidate!) ? errorText : null;
+  }
+
+  /// check if the string is a valid MAC address
+  bool isMACAddress(String value) {
+    final String splitChar = value.contains(':') ? ':' : '-';
+    final List<String> parts = value.split(splitChar);
+    if (parts.length != 6) {
+      return false;
+    }
+
+    for (final String part in parts) {
+      if (part.length != 2 || !regex.hasMatch(part)) {
+        return false;
+      }
+    }
+    return true;
+  }
+}