Fixes

martijn00 · martijn00 · commit 323723a47f3e · 2024-07-01T23:37:39.000+02:00
diff --git a/lib/src/numeric/max_validator.dart b/lib/src/numeric/max_validator.dart
@@ -23,14 +23,18 @@ class MaxValidator<T> extends BaseValidator<T> {
 
   @override
   String? validateValue(T valueCandidate) {
-    final num value;
-    switch (T) {
-      case String:
-        value = num.tryParse(valueCandidate! as String)!;
-      case num:
-        value = valueCandidate! as num;
-      default:
-        return errorText;
+    final num? value;
+
+    if (valueCandidate is String) {
+      value = num.tryParse(valueCandidate);
+    } else if (valueCandidate is num) {
+      value = valueCandidate;
+    } else {
+      return errorText;
+    }
+
+    if (value == null) {
+      return errorText;
     }
 
     if (inclusive) {
diff --git a/lib/src/numeric/min_validator.dart b/lib/src/numeric/min_validator.dart
@@ -23,14 +23,17 @@ class MinValidator<T> extends BaseValidator<T> {
 
   @override
   String? validateValue(T valueCandidate) {
-    final num value;
-    switch (T) {
-      case String:
-        value = num.tryParse(valueCandidate! as String)!;
-      case num:
-        value = valueCandidate! as num;
-      default:
-        return errorText;
+    final num? value;
+    if (valueCandidate is String) {
+      value = num.tryParse(valueCandidate);
+    } else if (valueCandidate is num) {
+      value = valueCandidate;
+    } else {
+      return errorText;
+    }
+
+    if (value == null) {
+      return errorText;
     }
 
     if (inclusive) {
diff --git a/lib/src/numeric/negative_number_validator.dart b/lib/src/numeric/negative_number_validator.dart
@@ -16,14 +16,17 @@ class NegativeNumberValidator<T> extends BaseValidator<T> {
 
   @override
   String? validateValue(T valueCandidate) {
-    final num value;
-    switch (T) {
-      case String:
-        value = num.tryParse(valueCandidate! as String)!;
-      case num:
-        value = valueCandidate! as num;
-      default:
-        return errorText;
+    final num? value;
+    if (valueCandidate is String) {
+      value = num.tryParse(valueCandidate);
+    } else if (valueCandidate is num) {
+      value = valueCandidate;
+    } else {
+      return errorText;
+    }
+
+    if (value == null) {
+      return errorText;
     }
 
     if (value >= 0) {
diff --git a/lib/src/numeric/not_zero_number_validator.dart b/lib/src/numeric/not_zero_number_validator.dart
@@ -16,14 +16,17 @@ class NotZeroNumberValidator<T> extends BaseValidator<T> {
 
   @override
   String? validateValue(T valueCandidate) {
-    final num value;
-    switch (T) {
-      case String:
-        value = num.tryParse(valueCandidate! as String)!;
-      case num:
-        value = valueCandidate! as num;
-      default:
-        return errorText;
+    final num? value;
+    if (valueCandidate is String) {
+      value = num.tryParse(valueCandidate);
+    } else if (valueCandidate is num) {
+      value = valueCandidate;
+    } else {
+      return errorText;
+    }
+
+    if (value == null) {
+      return errorText;
     }
 
     if (value == 0) {
diff --git a/lib/src/numeric/numeric_validator.dart b/lib/src/numeric/numeric_validator.dart
@@ -17,13 +17,12 @@ class NumericValidator<T> extends BaseValidator<T> {
   @override
   String? validateValue(T valueCandidate) {
     final num? value;
-    switch (T) {
-      case String:
-        value = num.tryParse(valueCandidate! as String);
-      case num:
-        value = valueCandidate! as num;
-      default:
-        return errorText;
+    if (valueCandidate is String) {
+      value = num.tryParse(valueCandidate);
+    } else if (valueCandidate is num) {
+      value = valueCandidate;
+    } else {
+      return errorText;
     }
 
     return value == null ? errorText : null;
diff --git a/lib/src/numeric/positive_number_validator.dart b/lib/src/numeric/positive_number_validator.dart
@@ -16,14 +16,17 @@ class PositiveNumberValidator<T> extends BaseValidator<T> {
 
   @override
   String? validateValue(T valueCandidate) {
-    final num value;
-    switch (T) {
-      case String:
-        value = num.tryParse(valueCandidate! as String)!;
-      case num:
-        value = valueCandidate! as num;
-      default:
-        return errorText;
+    final num? value;
+    if (valueCandidate is String) {
+      value = num.tryParse(valueCandidate);
+    } else if (valueCandidate is num) {
+      value = valueCandidate;
+    } else {
+      return errorText;
+    }
+
+    if (value == null) {
+      return errorText;
     }
 
     if (value <= 0) {
diff --git a/lib/src/numeric/range_validator.dart b/lib/src/numeric/range_validator.dart
@@ -61,17 +61,11 @@ class RangeValidator<T> extends BaseValidator<T> {
     final String? maxLengthResult =
         _maxLengthValidator.validate(valueCandidate);
 
-    if (minResult == null &&
-        maxResult == null &&
-        minLengthResult == null &&
-        maxLengthResult == null) {
+    if ((minResult == null && maxResult == null) ||
+        (minLengthResult == null && maxLengthResult == null)) {
       return null;
     } else {
-      return minResult ??
-          maxResult ??
-          minLengthResult ??
-          maxLengthResult ??
-          errorText;
+      return errorText;
     }
   }
 }
diff --git a/lib/src/string/match_not_validator.dart b/lib/src/string/match_not_validator.dart
@@ -19,6 +19,6 @@ class MatchNotValidator extends BaseValidator<String> {
 
   @override
   String? validateValue(String valueCandidate) {
-    return regex.hasMatch(valueCandidate) ? null : errorText;
+    return !regex.hasMatch(valueCandidate) ? errorText : null;
   }
 }
diff --git a/lib/src/string/match_validator.dart b/lib/src/string/match_validator.dart
@@ -19,6 +19,6 @@ class MatchValidator extends BaseValidator<String> {
 
   @override
   String? validateValue(String valueCandidate) {
-    return !regex.hasMatch(valueCandidate) ? null : errorText;
+    return regex.hasMatch(valueCandidate) ? null : errorText;
   }
 }
diff --git a/lib/src/string/single_line_validator.dart b/lib/src/string/single_line_validator.dart
@@ -16,7 +16,7 @@ class SingleLineValidator extends BaseValidator<String> {
 
   @override
   String? validateValue(String valueCandidate) {
-    return !valueCandidate.contains('\n') && !valueCandidate.contains('\r')
+    return valueCandidate.contains('\n') || valueCandidate.contains('\r')
         ? errorText
         : null;
   }
diff --git a/lib/src/usecase/color_code_validator.dart b/lib/src/usecase/color_code_validator.dart
@@ -49,15 +49,20 @@ class ColorCodeValidator extends BaseValidator<String> {
   ///
   /// Examples: hsl(360, 100%, 50%), hsl(120, 75%, 25%)
   /// {@endtemplate}
-  static final RegExp _hsl = RegExp(r'^hsl\(\d+,\s*\d+%,\s*\d+%\)$');
+  static final RegExp _hsl = RegExp(
+    r'^hsl\(\s*(\d{1,3})\s*,\s*(\d{1,3})%\s*,\s*(\d{1,3})%\s*\)$',
+  );
 
   @override
   String get translatedErrorText =>
       FormBuilderLocalizations.current.colorCodeErrorText(formats.join(', '));
 
   @override
   String? validateValue(String valueCandidate) {
-    return !isColorCode(valueCandidate, formats: formats) ? errorText : null;
+    if (regex != null && regex!.hasMatch(valueCandidate)) {
+      return null;
+    }
+    return isColorCode(valueCandidate, formats: formats) ? null : errorText;
   }
 
   /// check if the string is a color
@@ -66,38 +71,35 @@ class ColorCodeValidator extends BaseValidator<String> {
     String value, {
     List<String> formats = const <String>['hex', 'rgb', 'hsl'],
   }) {
-    if (formats.contains('hex') && (regex != null && regex!.hasMatch(value)) ||
-        _hex.hasMatch(value)) {
-      return true;
-    } else if (formats.contains('rgb') &&
-            (regex != null && regex!.hasMatch(value)) ||
-        _rgb.hasMatch(value)) {
-      final List<String> parts =
-          value.substring(4, value.length - 1).split(',');
-      for (final String part in parts) {
-        final int colorValue = int.tryParse(part.trim()) ?? -1;
-        if (colorValue < 0 || colorValue > 255) {
-          return false;
-        }
-      }
-      return true;
-    } else if (formats.contains('hsl') &&
-            (regex != null && regex!.hasMatch(value)) ||
-        _hsl.hasMatch(value)) {
-      final List<String> parts =
-          value.substring(4, value.length - 1).split(',');
-      for (int i = 0; i < parts.length; i++) {
-        final int colorValue = int.tryParse(parts[i].trim()) ?? -1;
-        if (i == 0) {
-          // Hue
-          if (colorValue < 0 || colorValue > 360) {
+    for (final String format in formats) {
+      if (format == 'hex' && _hex.hasMatch(value)) {
+        return true;
+      } else if (format == 'rgb' && _rgb.hasMatch(value)) {
+        final List<String> parts =
+            value.substring(4, value.length - 1).split(',');
+        for (final String part in parts) {
+          final int colorValue = int.tryParse(part.trim()) ?? -1;
+          if (colorValue < 0 || colorValue > 255) {
             return false;
           }
-        } else if (colorValue < 0 || colorValue > 100) {
+        }
+        return true;
+      } else if (format == 'hsl' && _hsl.hasMatch(value)) {
+        final List<String?> parts =
+            _hsl.firstMatch(value)!.groups(<int>[1, 2, 3]);
+        final int hue = int.tryParse(parts[0]!) ?? -1;
+        final int saturation = int.tryParse(parts[1]!) ?? -1;
+        final int lightness = int.tryParse(parts[2]!) ?? -1;
+        if (hue < 0 ||
+            hue > 360 ||
+            saturation < 0 ||
+            saturation > 100 ||
+            lightness < 0 ||
+            lightness > 100) {
           return false;
         }
+        return true;
       }
-      return true;
     }
     return false;
   }
diff --git a/lib/src/usecase/ssn_validator.dart b/lib/src/usecase/ssn_validator.dart
@@ -18,11 +18,14 @@ class SsnValidator extends BaseValidator<String> {
   /// {@template ssn_template}
   /// This regex matches SSN (Social Security Number).
   /// - It consists of 9 characters.
-  /// - It starts with three digits, followed by a hyphen, two digits, another hyphen, and four digits.
+  /// - It starts with three digits, followed by a hyphen, two digits,
+  /// another hyphen, and four digits.
   /// Examples: 123-45-6789
   /// {@endtemplate}
   static final RegExp _ssn = RegExp(r'^\d{3}-\d{2}-\d{4}$');
 
+  static final RegExp _ssnCleaned = RegExp(r'^\d{9}$');
+
   @override
   String get translatedErrorText =>
       FormBuilderLocalizations.current.ssnErrorText;
@@ -40,6 +43,8 @@ class SsnValidator extends BaseValidator<String> {
       return false;
     }
 
-    return regex.hasMatch(ssn);
+    return regex == _ssn
+        ? regex.hasMatch(value) || _ssnCleaned.hasMatch(ssn)
+        : regex.hasMatch(value) || regex.hasMatch(ssn);
   }
 }
diff --git a/test/src/string/match_not_validator_test.dart b/test/src/string/match_not_validator_test.dart
@@ -11,7 +11,7 @@ void main() {
       // Arrange
       final MatchNotValidator validator =
           MatchNotValidator(RegExp(r'^[a-zA-Z]+$'));
-      const String value = '12345';
+      const String value = 'abcde';
 
       // Act
       final String? result = validator.validate(value);
@@ -26,7 +26,7 @@ void main() {
       // Arrange
       final MatchNotValidator validator =
           MatchNotValidator(RegExp(r'^[a-zA-Z]+$'));
-      const String value = 'abcdef';
+      const String value = '12345';
 
       // Act
       final String? result = validator.validate(value);
@@ -43,7 +43,7 @@ void main() {
         RegExp(r'^[a-zA-Z]+$'),
         errorText: customErrorMessage,
       );
-      const String value = 'abcdef';
+      const String value = '12345';
 
       // Act
       final String? result = validator.validate(value);
diff --git a/test/src/usecase/ssn_validator_test.dart b/test/src/usecase/ssn_validator_test.dart
@@ -45,19 +45,6 @@ void main() {
       expect(result, customErrorMessage);
     });
 
-    test('should return error if the SSN has invalid format', () {
-      // Arrange
-      final SsnValidator validator =
-          SsnValidator(errorText: customErrorMessage);
-      const String invalidFormatSsn = '123456789';
-
-      // Act
-      final String? result = validator.validate(invalidFormatSsn);
-
-      // Assert
-      expect(result, customErrorMessage);
-    });
-
     test('should return error if the SSN has letters', () {
       // Arrange
       final SsnValidator validator =

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ class MatchNotValidator extends BaseValidator<String> {`
`19`	`19`
`20`	`20`	`@override`
`21`	`21`	`String? validateValue(String valueCandidate) {`
`22`		`- return regex.hasMatch(valueCandidate) ? null : errorText;`
	`22`	`+ return !regex.hasMatch(valueCandidate) ? errorText : null;`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ class MatchValidator extends BaseValidator<String> {`
`19`	`19`
`20`	`20`	`@override`
`21`	`21`	`String? validateValue(String valueCandidate) {`
`22`		`- return !regex.hasMatch(valueCandidate) ? null : errorText;`
	`22`	`+ return regex.hasMatch(valueCandidate) ? null : errorText;`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class SingleLineValidator extends BaseValidator<String> {`
`16`	`16`
`17`	`17`	`@override`
`18`	`18`	`String? validateValue(String valueCandidate) {`
`19`		`- return !valueCandidate.contains('\n') && !valueCandidate.contains('\r')`
	`19`	`+ return valueCandidate.contains('\n') \|\| valueCandidate.contains('\r')`
`20`	`20`	`? errorText`
`21`	`21`	`: null;`
`22`	`22`	`}`