Fixed initial validation; updated readme; added convenience operators

README.md

@@ -79,8 +79,8 @@ Button { } label: {
 | .minLength(Int) | If set, the value must be longer than the provided length. | ```.minLength(10)``` |
 | .maxLength(Int) | If set, the value must be shorter than the provided length. | ```.maxLength(10)``` |
 | .pattern(String) | If set, the value must match the provided regular expression. | ```.pattern("[a-zA-Z]")``` |
-| .pattern(RegEx) | If set, the value must match the provided regular expression. | ```.pattern("[a-zA-Z]")``` |
-| .email | If set, the value must match an internal regular expression for email addresses. | ```.pattern("[a-zA-Z]/)``` |
+| .email | If set, the value must match an internal regular expression for email addresses. | ```.email``` |
+| .phone | If set, the value must match an internal regular expression for phone numbers. | ```.phone``` |
 
 
 ## Example

Sources/Formify/FormifyField.swift

@@ -29,7 +29,7 @@ public struct FormifyField {
     public private(set) var pattern: Regex<Substring>?
 
     public var isValid: Bool {
-        errors.isEmpty
+        isRequired && value.isEmpty ? false : errors.isEmpty
     }
 
     public init(_ initialValue: String = "", operators: [FormifyOperator] = []) {
@@ -45,6 +45,10 @@ public struct FormifyField {
                 maxLength = length
             case .pattern(let regex):
                 pattern = try? Regex(regex)
+            case .email:
+                pattern = try? Regex("[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}")
+            case .phonenumber:
+                pattern = try? Regex("\\+?([0-9]{1,3})?[-.\\s]?(\\(?[0-9]{1,4}\\)?)?[-.\\s]?[0-9]{1,4}[-.\\s]?[0-9]{1,4}[-.\\s]?[0-9]{0,9}")
             }
         }
     }

Sources/Formify/FormifyOperator.swift

@@ -12,4 +12,6 @@ public enum FormifyOperator {
     case pattern(String)
     case minLength(Int)
     case maxLength(Int)
+    case email
+    case phonenumber
 }