Replace DictionaryWrapper by using CodingKeyRepresentable on key type…

…s instead (#54)
liamnichols · Apr 12, 2024 · 8a973a7 · 8a973a7
1 parent 839f2e4
commit 8a973a7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 110 deletions.
diff --git a/Sources/StringCatalog/Types/StringEntry.swift b/Sources/StringCatalog/Types/StringEntry.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 public struct StringEntry: Codable {
-    public typealias Localizations = DictionaryWrapper<StringLanguage, StringLocalization>
+    public typealias Localizations = [StringLanguage: StringLocalization]
 
     public var comment: String?
     public var extractionState: StringExtractionState?

diff --git a/Sources/StringCatalog/Types/StringLanguage.swift b/Sources/StringCatalog/Types/StringLanguage.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-public struct StringLanguage: Codable, Hashable, RawRepresentable, ExpressibleByStringLiteral {
+public struct StringLanguage: Codable, Hashable, RawRepresentable, ExpressibleByStringLiteral, CodingKeyRepresentable {
     public let rawValue: String
 
     public init(rawValue: String) {

diff --git a/Sources/StringCatalog/Types/StringVariations.swift b/Sources/StringCatalog/Types/StringVariations.swift
@@ -1,17 +1,17 @@
 import Foundation
 
 public struct StringVariations: Codable {
-    public let device: DictionaryWrapper<DeviceKey, StringVariation>?
-    public let plural: DictionaryWrapper<PluralKey, StringVariation>?
+    public let device: [DeviceKey: StringVariation]?
+    public let plural: [PluralKey: StringVariation]?
 
-    public init(device: DictionaryWrapper<DeviceKey, StringVariation>?, plural: DictionaryWrapper<PluralKey, StringVariation>?) {
+    public init(device: [DeviceKey: StringVariation]?, plural: [PluralKey: StringVariation]?) {
         self.device = device
         self.plural = plural
     }
 }
 
 extension StringVariations {
-    public struct DeviceKey: Codable, Hashable, RawRepresentable, ExpressibleByStringLiteral {
+    public struct DeviceKey: Codable, Hashable, RawRepresentable, ExpressibleByStringLiteral, CodingKeyRepresentable {
         public let rawValue: String
 
         public init(rawValue: String) {
@@ -32,7 +32,7 @@ extension StringVariations {
         public static let other = Self(rawValue: "other")
     }
 
-    public struct PluralKey: Codable, Hashable, RawRepresentable, ExpressibleByStringLiteral {
+    public struct PluralKey: Codable, Hashable, RawRepresentable, ExpressibleByStringLiteral, CodingKeyRepresentable {
         public let rawValue: String
 
         public init(rawValue: String) {

diff --git a/Sources/StringCatalog/Utilities/DictionaryWrapper.swift b/Sources/StringCatalog/Utilities/DictionaryWrapper.swift
diff --git a/Sources/StringExtractor/Resource+StringUnit.swift b/Sources/StringExtractor/Resource+StringUnit.swift
@@ -76,13 +76,13 @@ extension Resource {
     }
 }
 
-private extension DictionaryWrapper where Key == StringVariations.DeviceKey, Value == StringVariation {
+private extension Dictionary where Key == StringVariations.DeviceKey, Value == StringVariation {
     var preferredDeviceVariation: StringVariation? {
         self[.other] ?? self.values.first
     }
 }
 
-private extension DictionaryWrapper where Key == StringVariations.PluralKey, Value == StringVariation {
+private extension Dictionary where Key == StringVariations.PluralKey, Value == StringVariation {
     var preferredPluralVariation: StringVariation? {
         self[.other] ?? self[.one] ?? self.values.first
     }