Fixes

martijn00 · martijn00 · commit a20c86e29cb4 · 2024-07-02T23:06:13.000+02:00
diff --git a/lib/src/bool/has_lowercase_chars_validator.dart b/lib/src/bool/has_lowercase_chars_validator.dart
@@ -35,8 +35,6 @@ class HasLowercaseCharsValidator extends BaseValidator<String> {
 
   @override
   String? validateValue(String valueCandidate) {
-    final int length = lowercaseCharLength(valueCandidate);
-
     return lowercaseCharLength(valueCandidate) >= atLeast ? null : errorText;
   }
 
diff --git a/lib/src/core/aggregate_validator.dart b/lib/src/core/aggregate_validator.dart
@@ -4,7 +4,7 @@ import '../../localization/l10n.dart';
 import '../base_validator.dart';
 
 class AggregateValidator<T> extends BaseValidator<T> {
-  const AggregateValidator(this.validators);
+  const AggregateValidator(this.validators) : super(checkNullOrEmpty: false);
 
   final List<FormFieldValidator<T>> validators;
 
@@ -13,9 +13,14 @@ class AggregateValidator<T> extends BaseValidator<T> {
       FormBuilderLocalizations.current.requiredErrorText;
 
   @override
-  String? validateValue(T valueCandidate) {
+  String? validate(T? valueCandidate) {
+    return validateValue(valueCandidate);
+  }
+
+  @override
+  String? validateValue(T? valueCandidate) {
     final List<String> errors = <String>[];
-    for (final FormFieldValidator<T> validator in validators) {
+    for (final FormFieldValidator<T?> validator in validators) {
       final String? error = validator(valueCandidate);
       if (error != null) {
         errors.add(error);
diff --git a/lib/src/core/compose_validator.dart b/lib/src/core/compose_validator.dart
@@ -4,7 +4,7 @@ import '../../localization/l10n.dart';
 import '../base_validator.dart';
 
 class ComposeValidator<T> extends BaseValidator<T> {
-  const ComposeValidator(this.validators);
+  const ComposeValidator(this.validators) : super(checkNullOrEmpty: false);
 
   final List<FormFieldValidator<T>> validators;
 
@@ -13,7 +13,12 @@ class ComposeValidator<T> extends BaseValidator<T> {
       FormBuilderLocalizations.current.requiredErrorText;
 
   @override
-  String? validateValue(T valueCandidate) {
+  String? validate(T? valueCandidate) {
+    return validateValue(valueCandidate);
+  }
+
+  @override
+  String? validateValue(T? valueCandidate) {
     for (final FormFieldValidator<T> validator in validators) {
       final String? validatorResult = validator.call(valueCandidate);
       if (validatorResult != null) {
diff --git a/lib/src/core/conditional_validator.dart b/lib/src/core/conditional_validator.dart
@@ -7,17 +7,23 @@ class ConditionalValidator<T> extends BaseValidator<T> {
   const ConditionalValidator(
     this.condition,
     this.validator,
-  );
+  ) : super(checkNullOrEmpty: false);
 
   final bool Function(T? value) condition;
+
   final FormFieldValidator<T> validator;
 
   @override
   String get translatedErrorText =>
       FormBuilderLocalizations.current.requiredErrorText;
 
   @override
-  String? validateValue(T valueCandidate) {
+  String? validate(T? valueCandidate) {
+    return validateValue(valueCandidate);
+  }
+
+  @override
+  String? validateValue(T? valueCandidate) {
     if (condition(valueCandidate)) {
       return validator.call(valueCandidate);
     }
diff --git a/lib/src/core/default_value_validator.dart b/lib/src/core/default_value_validator.dart
@@ -4,7 +4,8 @@ import '../../localization/l10n.dart';
 import '../base_validator.dart';
 
 class DefaultValueValidator<T> extends BaseValidator<T> {
-  const DefaultValueValidator(this.defaultValue, this.validator);
+  const DefaultValueValidator(this.defaultValue, this.validator)
+      : super(checkNullOrEmpty: false);
 
   final T defaultValue;
   final FormFieldValidator<T> validator;
@@ -14,7 +15,12 @@ class DefaultValueValidator<T> extends BaseValidator<T> {
       FormBuilderLocalizations.current.requiredErrorText;
 
   @override
-  String? validateValue(T valueCandidate) {
+  String? validate(T? valueCandidate) {
+    return validateValue(valueCandidate);
+  }
+
+  @override
+  String? validateValue(T? valueCandidate) {
     return validator.call(valueCandidate ?? defaultValue);
   }
 }
diff --git a/lib/src/core/log_validator.dart b/lib/src/core/log_validator.dart
@@ -4,14 +4,12 @@ import '../../localization/l10n.dart';
 import '../base_validator.dart';
 
 class LogValidator<T> extends BaseValidator<T> {
-  const LogValidator(
-    this.log, {
+  const LogValidator({
+    this.log,
+
     /// {@macro base_validator_error_text}
     super.errorText,
-
-    /// {@macro base_validator_null_check}
-    super.checkNullOrEmpty,
-  });
+  }) : super(checkNullOrEmpty: false);
 
   final String Function(T? value)? log;
 
@@ -20,7 +18,12 @@ class LogValidator<T> extends BaseValidator<T> {
       FormBuilderLocalizations.current.requiredErrorText;
 
   @override
-  String? validateValue(T valueCandidate) {
+  String? validate(T? valueCandidate) {
+    return validateValue(valueCandidate);
+  }
+
+  @override
+  String? validateValue(T? valueCandidate) {
     if (log != null) {
       debugPrint(log!(valueCandidate));
     } else if (valueCandidate != null) {
diff --git a/lib/src/core/or_validator.dart b/lib/src/core/or_validator.dart
@@ -4,14 +4,7 @@ import '../../localization/l10n.dart';
 import '../base_validator.dart';
 
 class OrValidator<T> extends BaseValidator<T> {
-  const OrValidator(
-    this.validators, {
-    /// {@macro base_validator_error_text}
-    super.errorText,
-
-    /// {@macro base_validator_null_check}
-    super.checkNullOrEmpty,
-  });
+  const OrValidator(this.validators) : super(checkNullOrEmpty: false);
 
   final List<FormFieldValidator<T>> validators;
 
@@ -20,7 +13,12 @@ class OrValidator<T> extends BaseValidator<T> {
       FormBuilderLocalizations.current.requiredErrorText;
 
   @override
-  String? validateValue(T valueCandidate) {
+  String? validate(T? valueCandidate) {
+    return validateValue(valueCandidate);
+  }
+
+  @override
+  String? validateValue(T? valueCandidate) {
     String? errorResult;
     for (final FormFieldValidator<T> validator in validators) {
       final String? validatorResult = validator.call(valueCandidate);
diff --git a/lib/src/core/skip_when_validator.dart b/lib/src/core/skip_when_validator.dart
@@ -7,7 +7,7 @@ class SkipWhenValidator<T> extends BaseValidator<T> {
   const SkipWhenValidator(
     this.condition,
     this.validator,
-  );
+  ) : super(checkNullOrEmpty: false);
 
   final bool Function(T? value) condition;
 
@@ -18,7 +18,12 @@ class SkipWhenValidator<T> extends BaseValidator<T> {
       FormBuilderLocalizations.current.requiredErrorText;
 
   @override
-  String? validateValue(T valueCandidate) {
+  String? validate(T? valueCandidate) {
+    return validateValue(valueCandidate);
+  }
+
+  @override
+  String? validateValue(T? valueCandidate) {
     if (condition(valueCandidate)) {
       return null;
     }
diff --git a/lib/src/core/transform_validator.dart b/lib/src/core/transform_validator.dart
@@ -7,9 +7,9 @@ class TransformValidator<T> extends BaseValidator<T> {
   const TransformValidator(
     this.transformer,
     this.validator,
-  );
+  ) : super(checkNullOrEmpty: false);
 
-  final T Function(T? value) transformer;
+  final T? Function(T? value) transformer;
 
   final FormFieldValidator<T> validator;
 
@@ -18,8 +18,13 @@ class TransformValidator<T> extends BaseValidator<T> {
       FormBuilderLocalizations.current.requiredErrorText;
 
   @override
-  String? validateValue(T valueCandidate) {
-    final T transformedValue = transformer(valueCandidate);
+  String? validate(T? valueCandidate) {
+    return validateValue(valueCandidate);
+  }
+
+  @override
+  String? validateValue(T? valueCandidate) {
+    final T? transformedValue = transformer(valueCandidate);
     return validator(transformedValue);
   }
 }
diff --git a/lib/src/form_builder_validators.dart b/lib/src/form_builder_validators.dart
@@ -53,16 +53,13 @@ class FormBuilderValidators {
   /// ## Parameters:
   /// - [log] The log message to display.
   /// - [errorText] The error message when the value is invalid.
-  /// - [checkNullOrEmpty] Whether to check for null or empty values.
-  static FormFieldValidator<T> log<T>(
-    String Function(T? value)? log, {
+  static FormFieldValidator<T> log<T>({
+    String Function(T? value)? log,
     String? errorText,
-    bool checkNullOrEmpty = true,
   }) =>
       LogValidator<T>(
-        log,
+        log: log,
         errorText: errorText,
-        checkNullOrEmpty: checkNullOrEmpty,
       ).validate;
 
   /// [FormFieldValidator] that skips the validation when a certain
diff --git a/lib/src/form_field_validator_extensions.dart b/lib/src/form_field_validator_extensions.dart
@@ -42,7 +42,7 @@ extension FormFieldValidatorExtensions<T> on FormFieldValidator<T> {
 
   /// Logs the value during the validation process.
   FormFieldValidator<T> log({String Function(T? value)? log}) {
-    return FormBuilderValidators.log(log);
+    return FormBuilderValidators.log(log: log);
   }
 
   /// Overrides the error message of the current validator.
diff --git a/lib/src/network/ip_validator.dart b/lib/src/network/ip_validator.dart
@@ -41,8 +41,9 @@ class IpValidator extends BaseValidator<String> {
   ///
   /// Examples: ::1, 2001:0db8:85a3:0000:0000:8a2e:0370:7334
   /// {@endtemplate}
-  static final RegExp _ipv6 =
-      RegExp(r'^::|^::1|^([a-fA-F0-9]{1,4}::?){1,7}([a-fA-F0-9]{1,4})$');
+  static final RegExp _ipv6 = RegExp(
+    r'^((?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:(?:(?::[0-9a-fA-F]{1,4}){1,6})|:(?:(?::[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(?::[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(?::0{1,4}){0,1}:){0,1}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|(?:[0-9a-fA-F]{1,4}:){1,4}:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$',
+  );
 
   @override
   String get translatedErrorText =>
diff --git a/test/src/core/conditional_validator_test.dart b/test/src/core/conditional_validator_test.dart
@@ -79,7 +79,7 @@ void main() {
       final ConditionalValidator<String> validator =
           ConditionalValidator<String>(
         (String? value) => value == 'check',
-        FormBuilderValidators.required(errorText: customErrorMessage),
+        FormBuilderValidators.minLength(6, errorText: customErrorMessage),
       );
 
       // Act
diff --git a/test/src/core/log_validator_test.dart b/test/src/core/log_validator_test.dart
@@ -9,7 +9,7 @@ void main() {
   group('LogValidator -', () {
     test('should log the valueCandidate if log function is null', () {
       // Arrange
-      const LogValidator<String> validator = LogValidator<String>(null);
+      const LogValidator<String> validator = LogValidator<String>();
       const String value = 'test';
 
       // Act & Assert
@@ -19,7 +19,7 @@ void main() {
     test('should log the custom message from log function', () {
       // Arrange
       final LogValidator<String> validator = LogValidator<String>(
-        (String? value) => 'Custom log: $value',
+        log: (String? value) => 'Custom log: $value',
       );
       const String value = 'test';
 
@@ -30,7 +30,6 @@ void main() {
     test('should log the errorText if valueCandidate is null', () {
       // Arrange
       final LogValidator<String> validator = LogValidator<String>(
-        null,
         errorText: customErrorMessage,
       );
       const String? value = null;
@@ -43,7 +42,7 @@ void main() {
         'should log valueCandidate.toString() if log function is null and valueCandidate is not null',
         () {
       // Arrange
-      const LogValidator<int> validator = LogValidator<int>(null);
+      const LogValidator<int> validator = LogValidator<int>();
       const int value = 123;
 
       // Act & Assert
@@ -54,7 +53,7 @@ void main() {
         () {
       // Arrange
       final LogValidator<int> validator = LogValidator<int>(
-        (int? value) => 'Custom log: $value',
+        log: (int? value) => 'Custom log: $value',
       );
       const int value = 123;
 
@@ -67,7 +66,6 @@ void main() {
         () {
       // Arrange
       final LogValidator<int> validator = LogValidator<int>(
-        null,
         errorText: customErrorMessage,
       );
       const int? value = null;
diff --git a/test/src/core/not_equal_validator_test.dart b/test/src/core/not_equal_validator_test.dart
@@ -152,12 +152,12 @@ void main() {
         'should return errorText if the list value is equal to the specified value',
         () {
       // Arrange
+      const List<String> value = <String>['a', 'b'];
       final NotEqualValidator<List<String>> validator =
           NotEqualValidator<List<String>>(
-        <String>['a', 'b'],
+        value,
         errorText: customErrorMessage,
       );
-      const List<String> value = <String>['a', 'b'];
 
       // Act
       final String? result = validator.validate(value);
diff --git a/test/src/core/or_validator_test.dart b/test/src/core/or_validator_test.dart
diff --git a/test/src/core/skip_when_validator_test.dart b/test/src/core/skip_when_validator_test.dart
diff --git a/test/src/form_field_validator_extensions_test.dart b/test/src/form_field_validator_extensions_test.dart
diff --git a/test/src/network/ip_validator_test.dart b/test/src/network/ip_validator_test.dart
diff --git a/test/src/network/longitude_validator_test.dart b/test/src/network/longitude_validator_test.dart

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ class HasLowercaseCharsValidator extends BaseValidator<String> {`
`35`	`35`
`36`	`36`	`@override`
`37`	`37`	`String? validateValue(String valueCandidate) {`
`38`		`- final int length = lowercaseCharLength(valueCandidate);`
`39`		`-`
`40`	`38`	`return lowercaseCharLength(valueCandidate) >= atLeast ? null : errorText;`
`41`	`39`	`}`
`42`	`40`