More

Author: martijn00

CHANGELOG.md

@@ -57,6 +57,9 @@
 - Add dateFuture
 - Add SSN (Social Security Number (USA))
 - Add fileName
+- Add negative number
+- Add positive number
+- Add not zero number
 
 ## 10.0.1
 

README.md

@@ -97,8 +97,8 @@ URL, min, max, minLength, maxLength, minWordsCount, maxWordsCount, IP, credit ca
 - `FormBuilderValidators.email()` - requires the field's value to be a valid email address.
 - `FormBuilderValidators.ip()` - requires the field's value to be a valid IP address.
 - `FormBuilderValidators.url()` - requires the field's value to be a valid URL.
-- `FormBuilderValidators.portNumber()` - requires the field's to be an valid port number.
-- `FormBuilderValidators.macAddress()` - requires the field's to be an valid MAC address.
+- `FormBuilderValidators.portNumber()` - requires the field's to be a valid port number.
+- `FormBuilderValidators.macAddress()` - requires the field's to be a valid MAC address.
 
 ### Numeric validators
 
@@ -114,6 +114,9 @@ URL, min, max, minLength, maxLength, minWordsCount, maxWordsCount, IP, credit ca
 - `FormBuilderValidators.minWordsCount()` - requires the word count of the field's value to be greater than or equal to the provided minimum count.
 - `FormBuilderValidators.equalLength()` - requires the length of the field's value to be equal to the provided minimum length.
 - `FormBuilderValidators.numeric()` - requires the field's value to be a valid number.
+- `FormBuilderValidators.positiveNumber()` - requires the field's to be a positive number.
+- `FormBuilderValidators.negativeNumber()` - requires the field's to be a negative number.
+- `FormBuilderValidators.notZeroNumber()` - requires the field's to be not a number zero.
 
 ### String validators
 
@@ -129,9 +132,9 @@ URL, min, max, minLength, maxLength, minWordsCount, maxWordsCount, IP, credit ca
 - `FormBuilderValidators.creditCard()` - requires the field's value to be a valid credit card number.
 - `FormBuilderValidators.creditCardExpirationDate()` - requires the field's value to be a valid credit card expiration date and can check if not expired yet.
 - `FormBuilderValidators.creditCardCVC()` - requires the field's value to be a valid credit card CVC number.
-- `FormBuilderValidators.iban()` - requires the field's to be an valid IBAN.
-- `FormBuilderValidators.bic()` - requires the field's to be an valid BIC.
-- `FormBuilderValidators.isbn()` - requires the field's to be an valid ISBN.
+- `FormBuilderValidators.iban()` - requires the field's to be a valid IBAN.
+- `FormBuilderValidators.bic()` - requires the field's to be a valid BIC.
+- `FormBuilderValidators.isbn()` - requires the field's to be a valid ISBN.
 - `FormBuilderValidators.uuid()` - requires the field's to be a valid uuid.
 - `FormBuilderValidators.colorCode()` - requires the field's value to be a valid color code.
 

lib/l10n/intl_en.arb

@@ -58,5 +58,8 @@
   "timeErrorText": "Value must be a valid time.",
   "dateMustBeInTheFutureErrorText": "Date must be in the future.",
   "dateMustBeInThePastErrorText": "Date must be in the past.",
-  "fileNameErrorText": "Value must be a valid file name."
+  "fileNameErrorText": "Value must be a valid file name.",
+  "negativeNumberErrorText": "Value must be a negative number.",
+  "positiveNumberErrorText": "Value must be a positive number.",
+  "notZeroNumberErrorText": "Value must not be zero."
 }

lib/src/form_builder_validators.dart

@@ -164,22 +164,13 @@ class FormBuilderValidators {
     bool inclusive = true,
     String? errorText,
     bool checkNullOrEmpty = true,
-  }) {
-    return (T? valueCandidate) {
-      if (valueCandidate != null) {
-        assert(valueCandidate is num || valueCandidate is String);
-        final num? number = valueCandidate is num
-            ? valueCandidate
-            : num.tryParse(valueCandidate.toString());
-
-        if (number != null && (inclusive ? number < min : number <= min)) {
-          return errorText ??
-              FormBuilderLocalizations.current.minErrorText(min);
-        }
-      }
-      return null;
-    };
-  }
+  }) =>
+      MinValidator<T>(
+        min,
+        inclusive: inclusive,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be less than (or equal) to the provided number.
   /// This validator checks if the field's value is less than or equal to the given maximum value.
@@ -193,22 +184,55 @@ class FormBuilderValidators {
     bool inclusive = true,
     String? errorText,
     bool checkNullOrEmpty = true,
-  }) {
-    return (T? valueCandidate) {
-      if (valueCandidate != null) {
-        assert(valueCandidate is num || valueCandidate is String);
-        final num? number = valueCandidate is num
-            ? valueCandidate
-            : num.tryParse(valueCandidate.toString());
-
-        if (number != null && (inclusive ? number > max : number >= max)) {
-          return errorText ??
-              FormBuilderLocalizations.current.maxErrorText(max);
-        }
-      }
-      return null;
-    };
-  }
+  }) =>
+      MaxValidator<T>(
+        max,
+        inclusive: inclusive,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
+
+  /// [FormFieldValidator] that requires the field's value to be a positive number.
+  ///
+  /// ## Parameters:
+  /// - [errorText] The error message to display when the value is not positive.
+  /// - [checkNullOrEmpty] Whether to check for null or empty values (default: true).
+  static FormFieldValidator<T> positiveNumber<T>({
+    String? errorText,
+    bool checkNullOrEmpty = true,
+  }) =>
+      PositiveNumberValidator<T>(
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
+
+  /// [FormFieldValidator] that requires the field's value to be a negative number.
+  ///
+  /// ## Parameters:
+  /// - [errorText] The error message to display when the value is not negative.
+  /// - [checkNullOrEmpty] Whether to check for null or empty values (default: true).
+  static FormFieldValidator<T> negativeNumber<T>({
+    String? errorText,
+    bool checkNullOrEmpty = true,
+  }) =>
+      NegativeNumberValidator<T>(
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
+
+  /// [FormFieldValidator] that requires the field's value to be a number that is not zero.
+  ///
+  /// ## Parameters:
+  /// - [errorText] The error message to display when the value is zero.
+  /// - [checkNullOrEmpty] Whether to check for null or empty values (default: true).
+  static FormFieldValidator<T> notZeroNumber<T>({
+    String? errorText,
+    bool checkNullOrEmpty = true,
+  }) =>
+      NotZeroNumberValidator<T>(
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the length of the field's value to be greater than or equal to the provided minimum length.
   /// This validator checks if the length of the field's value meets the minimum length requirement.
@@ -384,14 +408,14 @@ class FormBuilderValidators {
   ///
   /// ## Parameters:
   /// - [errorText] The error message to display when the number is invalid.
-  static FormFieldValidator<String> numeric({
+  static FormFieldValidator<T> numeric<T>({
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) => valueCandidate?.isNotEmpty == true &&
-              null == num.tryParse(valueCandidate!)
-          ? errorText ?? FormBuilderLocalizations.current.numericErrorText
-          : null;
+      NumericValidator<T>(
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be a valid integer.
   /// This validator checks if the field's value is a valid integer.
@@ -404,10 +428,11 @@ class FormBuilderValidators {
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) => valueCandidate?.isNotEmpty == true &&
-              null == int.tryParse(valueCandidate!, radix: radix)
-          ? errorText ?? FormBuilderLocalizations.current.integerErrorText
-          : null;
+      IntegerValidator(
+        radix: radix,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be a valid credit card number.
   /// This validator checks if the field's value is a valid credit card number.
@@ -737,36 +762,24 @@ class FormBuilderValidators {
   /// This validator checks if the field's value is within the specified numerical range.
   ///
   /// ## Parameters:
-  /// - [minValue] The minimum value that the field's value should be greater than or equal to.
-  /// - [maxValue] The maximum value that the field's value should be less than or equal to.
+  /// - [min] The minimum value that the field's value should be greater than or equal to.
+  /// - [max] The maximum value that the field's value should be less than or equal to.
   /// - [inclusive] Whether the range is inclusive (default: true).
   /// - [errorText] The error message to display when the value is not in the range.
   static FormFieldValidator<T> range<T>(
-    num minValue,
-    num maxValue, {
+    num min,
+    num max, {
     bool inclusive = true,
     String? errorText,
     bool checkNullOrEmpty = true,
-  }) {
-    return (T? valueCandidate) {
-      if (valueCandidate != null) {
-        assert(valueCandidate is num || valueCandidate is String);
-        final num? number = valueCandidate is num
-            ? valueCandidate
-            : num.tryParse(valueCandidate.toString());
-
-        final String? minResult =
-            min(minValue, inclusive: inclusive, errorText: errorText)(number);
-        final String? maxResult =
-            max(maxValue, inclusive: inclusive, errorText: errorText)(number);
-
-        if (minResult != null || maxResult != null) {
-          return errorText ?? minResult ?? maxResult;
-        }
-      }
-      return null;
-    };
-  }
+  }) =>
+      RangeValidator<T>(
+        min,
+        max,
+        inclusive: inclusive,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be a bool and true.
   /// This validator checks if the field's value is true.
@@ -1099,10 +1112,10 @@ class FormBuilderValidators {
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) =>
-          valueCandidate?.isEmpty != false || !isOddNumber(valueCandidate!)
-              ? errorText ?? FormBuilderLocalizations.current.oddNumberErrorText
-              : null;
+      OddNumberValidator(
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be an even number.
   /// This validator checks if the field's value is an even number.
@@ -1113,10 +1126,10 @@ class FormBuilderValidators {
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) => valueCandidate?.isEmpty != false ||
-              !isEvenNumber(valueCandidate!)
-          ? errorText ?? FormBuilderLocalizations.current.evenNumberErrorText
-          : null;
+      EvenNumberValidator(
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be a valid port number.
   /// This validator checks if the field's value is a valid port number.
@@ -1131,19 +1144,12 @@ class FormBuilderValidators {
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (String? valueCandidate) {
-        if (valueCandidate?.isNotEmpty == true) {
-          final int? port = int.tryParse(valueCandidate!);
-          if (port == null || port < min || port > max) {
-            return errorText ??
-                FormBuilderLocalizations.current.portNumberErrorText(min, max);
-          }
-        } else {
-          return errorText ??
-              FormBuilderLocalizations.current.portNumberErrorText(min, max);
-        }
-        return null;
-      };
+      PortNumberValidator(
+        min: min,
+        max: max,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be a valid MAC address.
   /// This validator checks if the field's value is a valid MAC address.
@@ -1233,11 +1239,12 @@ class FormBuilderValidators {
     String? errorText,
     bool checkNullOrEmpty = true,
   }) =>
-      (num? valueCandidate) =>
-          valueCandidate == null || valueCandidate < min || valueCandidate > max
-              ? errorText ??
-                  FormBuilderLocalizations.current.betweenErrorText(min, max)
-              : null;
+      BetweenValidator(
+        min,
+        max,
+        errorText: errorText,
+        checkNullOrEmpty: checkNullOrEmpty,
+      ).validate;
 
   /// [FormFieldValidator] that requires the field's value to be in a list of values.
   /// This validator checks if the field's value is in the given list of values.

lib/src/network/network.dart

@@ -2,4 +2,5 @@ export 'email_validator.dart';
 export 'ip_validator.dart';
 export 'mac_address_validator.dart';
 export 'phone_number_validator.dart';
+export 'port_number_validator.dart';
 export 'url_validator.dart';

lib/src/network/port_number_validator.dart

@@ -0,0 +1,32 @@
+import '../../localization/l10n.dart';
+import '../base_validator.dart';
+
+class PortNumberValidator extends BaseValidator<String> {
+  PortNumberValidator({
+    this.min = 0,
+    this.max = 65535,
+
+    /// {@macro base_validator_error_text}
+    super.errorText,
+
+    /// {@macro base_validator_null_check}
+    super.checkNullOrEmpty,
+  });
+
+  final int min;
+
+  final int max;
+
+  @override
+  String get translatedErrorText =>
+      FormBuilderLocalizations.current.portNumberErrorText(min, max);
+
+  @override
+  String? validateValue(String? valueCandidate) {
+    final int? port = int.tryParse(valueCandidate!);
+    if (port == null || port < min || port > max) {
+      return errorText;
+    }
+    return null;
+  }
+}

lib/src/numeric/between_validator.dart

@@ -1,2 +1,31 @@
 import '../../localization/l10n.dart';
 import '../base_validator.dart';
+
+class BetweenValidator extends BaseValidator<num> {
+  BetweenValidator(
+    this.min,
+    this.max, {
+    /// {@macro base_validator_error_text}
+    super.errorText,
+
+    /// {@macro base_validator_null_check}
+    super.checkNullOrEmpty,
+  });
+
+  final num min;
+  final num max;
+
+  @override
+  String get translatedErrorText =>
+      FormBuilderLocalizations.current.betweenErrorText(min, max);
+
+  @override
+  String? validateValue(num? valueCandidate) {
+    final num value = valueCandidate!;
+    if (value < min || value > max) {
+      return errorText;
+    }
+
+    return null;
+  }
+}