Make type constraintes less strict (#5)

* Make type constraintes less strict

Author: pridees

Sources/CombineValidate/Publishers/Published+Extensions.swift

@@ -1,36 +1,36 @@
 import Combine
 
 /// Useful extension for Published wrapped values
-extension Published.Publisher where Value == String {
+extension Publisher where Output == String, Failure == Never {
     public func validateNonEmpty(
         error message: String,
         tableName: String? = nil
     ) -> ValidationPublisher {
-        NotEmptyValidator(for: self, error: message, tableName: tableName)
+        NotEmptyValidator(for: AnyPublisher(self), error: message, tableName: tableName)
     }
 
     public func validateWithRegex<R: RegexProtocol>(
         regex pattern: R,
         error message: String,
         tableName: String? = nil
     ) -> ValidationPublisher {
-        RegexValidator(for: self, regex: pattern, error: message, tableName: tableName)
+        RegexValidator(for: AnyPublisher(self), regex: pattern, error: message, tableName: tableName)
     }
 
     public func validateOneOfRegex<R: RegexProtocol>(
         regexs patterns: [R],
         error message: String,
         tableName: String? = nil
-    ) -> RichValidationPublisher<R> {
-        OneOfRegexValidator(for: self, regexs: patterns, error: message, tableName: tableName)
+    ) -> ValidationPublisherOf<R> {
+        OneOfRegexValidator(for: AnyPublisher(self), regexs: patterns, error: message, tableName: tableName)
     }
 
     public func validateWithMultiRegex<R: RegexProtocol>(
         regexs patterns: [R],
         errors messages: [String],
         tableName: String? = nil
     ) -> ValidationPublisher {
-        MultiRegexValidator(for: self, regexs: patterns, errors: messages, tableName: tableName)
+        MultiRegexValidator(for: AnyPublisher(self), regexs: patterns, errors: messages, tableName: tableName)
     }
 }
 
@@ -39,7 +39,7 @@ extension Published.Publisher where Value == Bool {
         error message: String,
         tableName: String? = nil
     ) -> ValidationPublisher {
-        ToggleValidator(for: self, error: message, tableName: tableName)
+        ToggleValidator(for: AnyPublisher(self), error: message, tableName: tableName)
     }
 }
 

Sources/CombineValidate/Publishers/Publishers+Validators.swift

@@ -2,7 +2,7 @@ import Foundation
 import Combine
 
 public func NotEmptyValidator(
-    for publisher: Published<String>.Publisher,
+    for publisher: AnyPublisher<String, Never>,
     error message: String,
     tableName: String? = nil
 ) -> ValidationPublisher {
@@ -15,7 +15,7 @@ public func NotEmptyValidator(
 }
 
 public func RegexValidator<Pattern>(
-    for publisher: Published<String>.Publisher,
+    for publisher: AnyPublisher<String, Never>,
     regex pattern: Pattern,
     error message: String,
     tableName: String? = nil
@@ -29,11 +29,11 @@ public func RegexValidator<Pattern>(
 }
 
 public func OneOfRegexValidator<Pattern>(
-    for publisher: Published<String>.Publisher,
+    for publisher: AnyPublisher<String, Never>,
     regexs patterns: [Pattern],
     error message: String,
     tableName: String? = nil
-) -> RichValidationPublisher<Pattern> where Pattern: RegexProtocol {
+) -> ValidationPublisherOf<Pattern> where Pattern: RegexProtocol {
     publisher
         .dropFirst()
         .debounce(for: .seconds(0.25), scheduler: RunLoop.main)
@@ -49,7 +49,7 @@ public func OneOfRegexValidator<Pattern>(
 }
 
 public func MultiRegexValidator<Pattern>(
-    for publisher: Published<String>.Publisher,
+    for publisher: AnyPublisher<String, Never>,
     regexs patterns: [Pattern],
     errors messages: [String],
     tableName: String? = nil
@@ -77,7 +77,7 @@ public func MultiRegexValidator<Pattern>(
 }
 
 public func ToggleValidator(
-    for publisher: Published<Bool>.Publisher,
+    for publisher: AnyPublisher<Bool, Never>,
     error message: String,
     tableName: String? = nil
 ) -> ValidationPublisher {

Sources/CombineValidate/Publishers/ValidationPublisher.swift

@@ -13,4 +13,4 @@ public typealias ValidationPublisher = AnyPublisher<Validated<Void>, Never>
 ///
 /// Use when you want to push through pipeline particular success case conforming ``RegexProtocol``
 /// Uses with ``OneOfRegexValidator(for:regexs:error:tableName:)``
-public typealias RichValidationPublisher<T> = AnyPublisher<Validated<T>, Never>
+public typealias ValidationPublisherOf<T> = AnyPublisher<Validated<T>, Never>

Sources/CombineValidate/Views/ValidationWrapper.swift

@@ -7,7 +7,7 @@ public struct ValidationWrapper<ValidatedView: View, ValidationPayload>: View {
     @State private var validated: Validated<ValidationPayload> = .untouched
 
     private let content: ValidatedView
-    private let publisher: RichValidationPublisher<ValidationPayload>
+    private let publisher: ValidationPublisherOf<ValidationPayload>
     private let configuration: Self.Configuration
 
     public init(
@@ -22,7 +22,7 @@ public struct ValidationWrapper<ValidatedView: View, ValidationPayload>: View {
 
     public init(
         _ content: ValidatedView,
-        _ publisher: RichValidationPublisher<ValidationPayload>,
+        _ publisher: ValidationPublisherOf<ValidationPayload>,
         configuration: Self.Configuration
     ) where ValidationPayload: RegexProtocol {
         self.content = content
@@ -80,15 +80,20 @@ public struct ValidationWrapper<ValidatedView: View, ValidationPayload>: View {
 }
 
 struct ValidationWrapper_Previews: PreviewProvider {
+    struct Person {
+        var email: String
+    }
+    
     class ViewModel: ObservableObject {
-        @Published var email = ""
+        @Published var person = Person(email: "")
 
         public lazy var emailValidator: ValidationPublisher = {
-            $email.validateWithRegex(
-                regex: RegularPattern.email,
-                error: "Not email",
-                tableName: nil
-            )
+            $person.map(\.email)
+                .validateWithRegex(
+                    regex: RegularPattern.email,
+                    error: "Not email",
+                    tableName: nil
+                )
         }()
     }
 
@@ -98,7 +103,7 @@ struct ValidationWrapper_Previews: PreviewProvider {
         var body: some View {
             NavigationView {
                 List {
-                    TextField("Email", text: $viewModel.email)
+                    TextField("Email", text: $viewModel.person.email)
                         .validate(for: viewModel.emailValidator)
                 }
             }

Sources/CombineValidate/Views/View+Validate.swift

@@ -1,7 +1,7 @@
 import Combine
 import SwiftUI
 
-extension TextField {
+extension View {
     public func validate(
         for publisher: ValidationPublisher,
         configuration: ValidationWrapper<Self, Void>.Configuration = .default
@@ -10,23 +10,14 @@ extension TextField {
     }
 
     public func validate<T: RegexProtocol>(
-        for publisher: RichValidationPublisher<T>,
+        for publisher: ValidationPublisherOf<T>,
         configuration: ValidationWrapper<Self, T>.Configuration = .default
     ) -> some View {
         ValidationWrapper(self, publisher, configuration: configuration)
     }
 }
 
-extension SecureField {
-    public func validate(
-        for publisher: ValidationPublisher,
-        configuration: ValidationWrapper<Self, Void>.Configuration = .default
-    ) -> some View {
-        ValidationWrapper(self, publisher, configuration: configuration)
-    }
-}
-
-extension Toggle {
+extension View {
     public func validate(
         for publisher: ValidationPublisher
     ) -> some View {

Tests/CombineValidateTests/OneOfRegexValidatorTests.swift

@@ -14,7 +14,7 @@ final class OneOfRegexValidatorTests: XCTestCase {
         @Published var socialProfileUrl = ""
         @Published var validationResult: Validated<SocialLinkPattern> = .untouched
 
-        public lazy var socialProfileValidator: RichValidationPublisher<SocialLinkPattern> = {
+        public lazy var socialProfileValidator: ValidationPublisherOf<SocialLinkPattern> = {
             $socialProfileUrl.validateOneOfRegex(
                 regexs: [.facebook, .linkedIn, .instagram],
                 error: "Type one of social profile link (insta, facebook, linkedIn)"