Fixed url validator, added IP, creditCard and date validators

More tests

Author: danvick

.idea/libraries/Dart_Packages.xml

@@ -288,7 +288,6 @@ GlobalKey<FormBuilderState> _fbKey = GlobalKey();
 - [ ] Assert no duplicates in `FormBuilderInput`s `attribute` names
 - [ ] Allow options for Checkboxes and Radios to appear left or right
 - [ ] Allow addition of custom input types
-- [ ] Proper validation for URL - does not work without protocol - http(s)
 
 ### New FormBuilder inputs
 - [X] SignaturePad

.idea/workspace.xml

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:validators/validators.dart';
 
 class FormBuilderValidators {
   /// [FormFieldValidator] that requires the field have a non-empty value.
@@ -93,22 +94,29 @@ class FormBuilderValidators {
   }) {
     return (val) {
       if (val != null && val.isNotEmpty) {
-        Pattern pattern =
-            r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$';
-        if (!RegExp(pattern).hasMatch(val)) return errorText;
+        if (!isEmail(val)) return errorText;
       }
     };
   }
 
   /// [FormFieldValidator] that requires the field's value to be a valid url.
-  static FormFieldValidator url({
-    String errorText = "This field requires a valid email address.",
-  }) {
+  static FormFieldValidator url(
+      {String errorText = "This field requires a valid URL address.",
+      List<String> protocols = const ['http', 'https', 'ftp'],
+      bool requireTld = true,
+      bool requireProtocol = false,
+      bool allowUnderscore = false,
+      List<String> hostWhitelist = const [],
+      List<String> hostBlacklist = const []}) {
     return (val) {
       if (val != null && val.isNotEmpty) {
-        Pattern pattern =
-            r"(https?|ftp)://([-A-Z0-9.]+)(/[-A-Z0-9+&@#/%=~_|!:,.;]*)?(\?[A-Z0-9+&@#/%=~_|!:‌​,.;]*)?";
-        if (!RegExp(pattern).hasMatch(val)) return errorText;
+        if (!isURL(val,
+            protocols: protocols,
+            requireTld: requireTld,
+            requireProtocol: requireProtocol,
+            allowUnderscore: allowUnderscore,
+            hostWhitelist: hostWhitelist,
+            hostBlacklist: hostBlacklist)) return errorText;
       }
     };
   }
@@ -134,4 +142,39 @@ class FormBuilderValidators {
       if (num.tryParse(val) == null && val.isNotEmpty) return errorText;
     };
   }
+
+  /// [FormFieldValidator] that requires the field's value to be a valid credit card number.
+  static FormFieldValidator creditCard({
+    String errorText = "This field requires a valid credit card number.",
+  }) {
+    return (val) {
+      if (val != null && val.isNotEmpty) {
+        if (!isCreditCard(val)) return errorText;
+      }
+    };
+  }
+
+  /// [FormFieldValidator] that requires the field's value to be a valid IP.
+  // ignore: non_constant_identifier_names
+  static FormFieldValidator IP({
+    dynamic version,
+    String errorText = "This field requires a valid IP.",
+  }) {
+    return (val) {
+      if (val != null && val.isNotEmpty) {
+        if (!isIP(val, version)) return errorText;
+      }
+    };
+  }
+
+  /// [FormFieldValidator] that requires the field's value to be a valid date string.
+  static FormFieldValidator date({
+    String errorText = "This field requires a valid date string.",
+  }) {
+    return (val) {
+      if (val != null && val.isNotEmpty) {
+        if (!isDate(val)) return errorText;
+      }
+    };
+  }
 }

README.md

@@ -380,6 +380,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
+  validators:
+    dependency: "direct main"
+    description:
+      name: validators
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0+1"
   vector_math:
     dependency: transitive
     description:

lib/src/form_builder_validators.dart

@@ -18,6 +18,7 @@ dependencies:
   datetime_picker_formfield: ^0.1.8
   signature: ^2.0.0
   expandable: ^2.0.0
+  validators: ^2.0.0
 
 dev_dependencies:
   flutter_test:

pubspec.lock

@@ -9,14 +9,37 @@ void main() {
   });
 
   test('FormBuilderValidators.email', () {
-    expect(FormBuilderValidators.email()("john@flutter"), equals("This field requires a valid email address."));
-    expect(FormBuilderValidators.email()("[email protected]"), equals(null));
-    expect(FormBuilderValidators.email()(null), equals(null));
-    expect(FormBuilderValidators.email()(""), equals(null));
+    expect(FormBuilderValidators.email()("john@flutter"), isNotNull);
+    expect(FormBuilderValidators.email()("[email protected]"), isNull);
+    expect(FormBuilderValidators.email()(null), isNull);
+    expect(FormBuilderValidators.email()(""),isNull);
   });
 
   test('FormBuilderValidators.max', () {
-    expect(FormBuilderValidators.max(20)("70"), equals("Value must be less than or equal to 20"));
-    expect(FormBuilderValidators.max(30)(70), equals("Value must be less than or equal to 30"));
+    expect(FormBuilderValidators.max(20)("70"), isNotNull);
+    expect(FormBuilderValidators.max(30)(70), isNotNull);
+    expect(FormBuilderValidators.max(30)(20), isNull);
+  });
+
+  test('FormBuilderValidators.min', () {
+    expect(FormBuilderValidators.min(30)("10"), isNotNull);
+    expect(FormBuilderValidators.min(30)(10), isNotNull);
+    expect(FormBuilderValidators.min(30)(70), isNull);
+  });
+
+  test('FormBuilderValidators.url', () {
+    expect(FormBuilderValidators.url()(null), isNull);
+    expect(FormBuilderValidators.url()("https://www.google.com"), isNull);
+    expect(FormBuilderValidators.url()("www.google.com"), isNull);
+    expect(FormBuilderValidators.url()("google.com"), isNull);
+    expect(FormBuilderValidators.url()("http://google.com"), isNull);
+    expect(FormBuilderValidators.url()(".com"), isNotNull);
+    expect(FormBuilderValidators.url(protocols: ['https', 'http'], errorText: "Only HTTP and HTTPS allowed")("ftp://www.google.com"), isNotNull);
+  });
+
+  test('FormBuilderValidators.IP', () {
+    expect(FormBuilderValidators.IP()(null), isNull);
+    expect(FormBuilderValidators.IP()("192.168.0.1"), isNull);
+    expect(FormBuilderValidators.IP()("256.168.0.1"), isNotNull);
   });
 }