Made PatternTextStyle's properties public variables. Made .pattern(_:) generic. Cleanup.

Author: oscbyspro

Sources/DiffableTextKitXPattern/Placeholders.swift

@@ -11,7 +11,7 @@
 // MARK: * Placeholders
 //*============================================================================*
 
-@usableFromInline struct Placeholders: Equatable {
+public struct PatternTextPlaceholders: Equatable {
 
     @usableFromInline typealias Predicate = (Character) -> Bool
 
@@ -25,16 +25,16 @@
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable init() {
+    @inlinable public init() {
         self.option = .none
     }
 
-    @inlinable init(_ some: Some.Elements) {
-        self.option = .some(Some(some))
+    @inlinable public init(_ placeholers: (Character, (Character) -> Bool)) {
+        self.option = .some(Some(placeholers))
     }
 
-    @inlinable init(_ many: Many.Elements) {
-        self.option = .many(Many(many))
+    @inlinable public init(_ placeholers: [Character: (Character) -> Bool]) {
+        self.option = .many(Many(placeholers))
     }
 
     //=------------------------------------------------------------------------=
@@ -63,23 +63,21 @@
 // MARK: + Option(s)
 //=----------------------------------------------------------------------------=
 
-extension Placeholders {
+extension PatternTextPlaceholders {
 
     //*========================================================================*
     // MARK: * Some [...]
     //*========================================================================*
 
     @usableFromInline struct Some: Equatable {
-        
-        @usableFromInline typealias Elements = (Character, Predicate)
-        
+                
         //=--------------------------------------------------------------------=
 
-        @usableFromInline let elements: Elements
+        @usableFromInline let elements: (Character, Predicate)
 
         //=--------------------------------------------------------------------=
 
-        @inlinable init(  _ elements: Elements) {
+        @inlinable init(  _ elements: (Character, Predicate)) {
             self.elements = elements
         }
 
@@ -97,16 +95,14 @@ extension Placeholders {
     //*========================================================================*
 
     @usableFromInline struct Many: Equatable {
-        
-        @usableFromInline typealias Elements = [Character: Predicate]
-        
+                
         //=--------------------------------------------------------------------=
 
-        @usableFromInline let elements: Elements
+        @usableFromInline let elements: [Character: Predicate]
 
         //=--------------------------------------------------------------------=
 
-        @inlinable init(  _ elements: Elements) {
+        @inlinable init(  _ elements: [Character: Predicate]) {
             self.elements = elements
         }
 

Sources/DiffableTextKitXPattern/Style.swift

@@ -16,31 +16,35 @@ import DiffableTextKit
 public struct PatternTextStyle<Value>: DiffableTextStyle where Value: Equatable,
 Value: RangeReplaceableCollection, Value.Element == Character {
 
+    public typealias Placeholders = PatternTextPlaceholders
+    
     //=------------------------------------------------------------------------=
     // MARK: State
     //=------------------------------------------------------------------------=
 
-    @usableFromInline let pattern: String
-    @usableFromInline var placeholders = Placeholders()
-    @usableFromInline var hidden = false
+    public var pattern: String
+    public var placeholders: Placeholders
+    public var hidden: Bool
 
     //=------------------------------------------------------------------------=
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable public init(_ pattern: String) { self.pattern = pattern }
+    @inlinable public init(_ pattern: String, placeholders: Placeholders = .init(), hidden: Bool = false) {
+        self.pattern = pattern; self.placeholders = placeholders; self.hidden = hidden
+    }
 
     //=------------------------------------------------------------------------=
     // MARK: Transformations
     //=------------------------------------------------------------------------=
 
-    /// Marks a single character as a placeholder.
+    /// Marks a single character as the style's placeholder.
     @inlinable public func placeholders(_ character: Character,
     where predicate: @escaping (Character) -> Bool) -> Self {
         var S0 = self; S0.placeholders = .init((character, predicate)); return S0
     }
 
-    /// Marks multiple characters as placeholders.
+    /// Marks multiple characters as the style's placeholders.
     @inlinable public func placeholders(_ placeholders: [Character: (Character) -> Bool]) -> Self {
         var S0 = self; S0.placeholders = .init(placeholders); return S0
     }
@@ -250,29 +254,8 @@ extension PatternTextStyle {
 //*============================================================================*
 // MARK: * Style x Init
 //*============================================================================*
-//=----------------------------------------------------------------------------=
-// MARK: + String
-//=----------------------------------------------------------------------------=
-
-extension DiffableTextStyle where Self == PatternTextStyle<String> {
-    
-    /// Creates a `PatternTextStyle` without placeholders.
-    ///
-    /// ```
-    /// DiffableTextField(value: $number) {
-    ///     .pattern("+## (###) ###-##-##")
-    ///     .placeholders("#") { $0.isASCII && $0.isNumber }
-    /// }
-    /// ```
-    ///
-    @inlinable public static func pattern(_ pattern: String) -> Self { Self(pattern) }
-}
 
-//=----------------------------------------------------------------------------=
-// MARK: + Array<Character>
-//=----------------------------------------------------------------------------=
-
-extension DiffableTextStyle where Self == PatternTextStyle<[Character]> {
+extension DiffableTextStyle {
 
     /// Creates a `PatternTextStyle` without placeholders.
     ///
@@ -283,5 +266,7 @@ extension DiffableTextStyle where Self == PatternTextStyle<[Character]> {
     /// }
     /// ```
     ///
-    @inlinable public static func pattern(_ pattern: String) -> Self { Self(pattern) }
+    @inlinable public static func pattern<T>(_ pattern: String) -> Self where Self == PatternTextStyle<T> {
+        Self(pattern)
+    }
 }

Sources/DiffableTextKitXUIKit/Environment+ToolbarDoneButton.swift

@@ -57,6 +57,7 @@ public extension View {
     ///
     /// **Notes**
     ///
+    /// - The value is read when the view is set up.
     /// - The default value is `nil` (no toolbar installed).
     /// - The `SwiftUI/toolbar` environment value is inaccessible.
     ///

Tests/DiffableTextKitXNumberTests/Styles/Style+Currency.swift

@@ -72,7 +72,7 @@ extension StyleTestsOnCurrency {
     //=------------------------------------------------------------------------=
 
     func testDecimal() {
-        XCTAssertCurrencies(-1.23 as Decimal)
+        XCTAssertCurrencies(Decimal(string: "-1234567.89")!)
     }
 }
 
@@ -106,7 +106,7 @@ extension StyleTestsOnCurrency {
     }
 
     func testInt8() {
-        XCTAssertCurrencies(-012 as Int8) // 9s
+        XCTAssertCurrencies(-12_ as Int8) // 9s
     }
 
     func testInt16() {
@@ -137,7 +137,7 @@ extension StyleTestsOnCurrency {
     }
 
     func testUInt8() {
-        XCTAssertCurrencies(012 as UInt8) // 9s
+        XCTAssertCurrencies(12_ as UInt8) // 9s
     }
 
     func testUInt16() {

Tests/DiffableTextKitXNumberTests/Styles/Style+Number.swift

@@ -41,7 +41,7 @@ extension StyleTestsOnNumber {
     //=------------------------------------------------------------------------=
 
     func testDecimal() {
-        XCTAssertLocales(-1.23 as Decimal)
+        XCTAssertLocales(Decimal(string: "-1234567.89")!)
     }
 }
 
@@ -75,7 +75,7 @@ extension StyleTestsOnNumber {
     }
 
     func testInt8() {
-        XCTAssertLocales(-012 as Int8) // 9s
+        XCTAssertLocales(-12_ as Int8) // 9s
     }
 
     func testInt16() {
@@ -106,7 +106,7 @@ extension StyleTestsOnNumber {
     }
 
     func testUInt8() {
-        XCTAssertLocales(012 as UInt8) // 9s
+        XCTAssertLocales(12_ as UInt8) // 9s
     }
 
     func testUInt16() {

Tests/DiffableTextKitXNumberTests/Styles/Style+Percent.swift

@@ -41,7 +41,7 @@ extension StyleTestsOnPercent {
     //=------------------------------------------------------------------------=
 
     func testDecimal() {
-        XCTAssertLocales(-1.23 as Decimal)
+        XCTAssertLocales(Decimal(string: "-1234567.89")!)
     }
 }
 

Tests/DiffableTextKitXPatternTests/Placeholders.swift

@@ -19,6 +19,8 @@ import XCTest
 
 final class PlaceholdersTests: XCTestCase {
 
+    typealias Placeholders = PatternTextPlaceholders
+    
     //=------------------------------------------------------------------------=
     // MARK: State
     //=------------------------------------------------------------------------=