Cleanup: Attributes, Translator. Renamed: Reader. Commented on Snapshot invariant.

Author: oscbyspro

Sources/DiffableTextKit/Models/Snapshot.swift

@@ -22,6 +22,10 @@
 /// on snapshots containing only formatting characters. As an example, a pattern text style
 /// bound to an empty value may anchor at the pattern's first placeholder character.
 ///
+/// On another note, the number of attributes in the snapshot must always equal
+/// the number of characters in its storage string. This is usually a trivial invariant
+/// to maintain, but failure to maintain it will lead to unexpected behavior.
+///
 public struct Snapshot: BidirectionalCollection, RangeReplaceableCollection {
     @usableFromInline typealias Target = (Index) -> Bool
 

Sources/DiffableTextKitXNumber/Models/Adapter.swift

@@ -42,7 +42,7 @@ public struct NumberTextAdapter<Format: NumberTextFormat>: Equatable {
     // MARK: Accessors
     //=------------------------------------------------------------------------=
 
-    @inlinable var reader: Reader {
+    @inlinable var reader: NumberTextReader {
         scheme.reader
     }
 

Sources/DiffableTextKitXNumber/Protocol.swift

@@ -62,7 +62,7 @@ extension NumberTextStyleProtocol {
         adapter.format
     }
 
-    @inlinable var reader: Reader {
+    @inlinable var reader: NumberTextReader {
         adapter.reader
     }
 

Sources/DiffableTextKitXNumber/Reader/Attributes.swift

@@ -26,6 +26,12 @@ import DiffableTextKit
     //=------------------------------------------------------------------------=
 
     @inlinable init(_ components: Components) {
+        //=--------------------------------------=
+        // Signs
+        //=--------------------------------------=
+        for sign in Sign.allCases {
+            self.map[components.signs[sign]] = .phantom.subtracting(.virtual)
+        }
         //=--------------------------------------=
         // Digits
         //=--------------------------------------=
@@ -36,12 +42,6 @@ import DiffableTextKit
         // Separators
         //=--------------------------------------=
         self.map[components.separators[.fraction]] = .removable
-        //=--------------------------------------=
-        // Signs
-        //=--------------------------------------=
-        for sign in Sign.allCases {
-            self.map[components.signs[sign]] = .phantom.subtracting(.virtual)
-        }
     }
 
     //=------------------------------------------------------------------------=

Sources/DiffableTextKitXNumber/Reader/Reader.swift

@@ -13,7 +13,7 @@ import DiffableTextKit
 // MARK: * Reader
 //*============================================================================*
 
-public final class Reader {
+public final class NumberTextReader {
 
     //=------------------------------------------------------------------------=
     // MARK: State

Sources/DiffableTextKitXNumber/Reader/Translator.swift

@@ -24,10 +24,10 @@
     //=------------------------------------------------------------------------=
 
     @inlinable init(_ local: Components) {
+        self.insert(\.signs,      from: .ascii, to: local, as: { $0 })
         self.insert(\.digits,     from: .ascii, to: local, as: { $0 })
         self.insert(\.separators, from: .ascii, to: local, as: { _ in .fraction })
         self.insert(\.separators, from:  local, to: local, as: { _ in .fraction })
-        self.insert(\.signs,      from: .ascii, to: local, as: { $0 })
     }
 
     //=------------------------------------------------------------------------=

Sources/DiffableTextKitXNumber/Scheme+Currency.swift

@@ -22,7 +22,7 @@ import Foundation
     //=------------------------------------------------------------------------=
 
     @usableFromInline let id: ID
-    @usableFromInline let reader: Reader
+    @usableFromInline let reader: NumberTextReader
     @usableFromInline let preferences: Preferences
     @usableFromInline let adjustments: Adjustments?
 
@@ -39,15 +39,16 @@ import Foundation
         formatter.currencyCode = id.code
         assert(formatter.numberStyle == .none)
         //=--------------------------------------=
-        // Formatter: None
+        // Formatter - None
         //=--------------------------------------=
         self.id = id
-        self.reader = Reader(.currency(formatter))
+        self.reader = NumberTextReader(.currency(formatter))
         //=--------------------------------------=
-        // Formatter: Currency
+        // Formatter - Currency
         //=--------------------------------------=
         formatter.numberStyle = .currency
         self.preferences = Preferences(formatter)
+        
         formatter.maximumFractionDigits = .zero
         self.adjustments = Adjustments(formatter, reader.components)
     }

Sources/DiffableTextKitXNumber/Scheme+Standard.swift

@@ -22,7 +22,7 @@ import Foundation
     //=------------------------------------------------------------------------=
 
     @usableFromInline let id: ID
-    @usableFromInline let reader: Reader
+    @usableFromInline let reader: NumberTextReader
 
     //=------------------------------------------------------------------------=
     // MARK: Initializers
@@ -36,10 +36,10 @@ import Foundation
         formatter.locale = id.locale
         assert(formatter.numberStyle == .none)
         //=--------------------------------------=
-        // Formatter: None
+        // Formatter - None
         //=--------------------------------------=
         self.id = id
-        self.reader = Reader(.standard(formatter))
+        self.reader = NumberTextReader(.standard(formatter))
     }
 
     //=------------------------------------------------------------------------=

Sources/DiffableTextKitXNumber/Scheme.swift

@@ -19,7 +19,7 @@ public protocol NumberTextScheme {
     // MARK: State
     //=------------------------------------------------------------------------=
 
-    @inlinable var reader: Reader { get }
+    @inlinable var reader: NumberTextReader { get }
 
     //=------------------------------------------------------------------------=
     // MARK: Autocorrect