LossyDictionary: added failing test and fix for key conversion issue

Sources/BetterCodable/LossyDictionary.swift

@@ -42,11 +42,12 @@ extension LossyDictionary: Decodable where Key: Decodable, Value: Decodable {
         var elements: [Key: Value] = [:]
         if Key.self == String.self {
             let container = try decoder.container(keyedBy: DictionaryCodingKey.self)
+            let keys = try Self.extractKeys(from: decoder, container: container)
 
-            for key in container.allKeys {
+            for (key, stringKey) in keys {
                 do {
                     let value = try container.decode(LossyDecodableValue<Value>.self, forKey: key).value
-                    elements[key.stringValue as! Key] = value
+                    elements[stringKey as! Key] = value
                 } catch {
                     _ = try? container.decode(AnyDecodableValue.self, forKey: key)
                 }
@@ -81,6 +82,21 @@ extension LossyDictionary: Decodable where Key: Decodable, Value: Decodable {
 
         self.wrappedValue = elements
     }
+
+    private static func extractKeys(
+        from decoder: Decoder,
+        container: KeyedDecodingContainer<DictionaryCodingKey>
+    ) throws -> [(DictionaryCodingKey, String)] {
+        // Decode a dictionary ignoring the values to decode the original keys
+        // without using the `JSONDecoder.KeyDecodingStrategy`.
+        let keys = try decoder.singleValueContainer().decode([String: AnyDecodableValue].self).keys
+
+        return zip(
+            container.allKeys.sorted(by: { $0.stringValue < $1.stringValue }),
+            keys.sorted()
+        )
+        .map { ($0, $1) }
+    }
 }
 
 extension LossyDictionary: Encodable where Key: Encodable, Value: Encodable {

Tests/BetterCodableTests/LossyDictionaryTests.swift

@@ -75,4 +75,27 @@ class LossyDictionaryTests: XCTestCase {
         XCTAssertEqual(fixture.stringToInt, ["one": 1, "two": 2, "three": 3])
         XCTAssertEqual(fixture.intToString, [1: "one", 2: "two", 3: "three"])
     }
+
+    func testEncodingLosslessDictionaryRetainsKeys() throws {
+        let decoder = JSONDecoder()
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
+
+        let encoder = JSONEncoder()
+        encoder.keyEncodingStrategy = .convertToSnakeCase
+
+        let fixture = Fixture(
+            stringToInt: [
+                "snake_case.with.dots_99.and_numbers": 1,
+                "dots.and_2.00.1_numbers": 2,
+                "key.1": 3,
+                "normal key": 4,
+                "another_key": 5
+            ],
+            intToString: [:]
+        )
+
+        let reencodedFixture = try decoder.decode(Fixture.self, from: encoder.encode(fixture))
+
+        XCTAssertEqual(reencodedFixture, fixture)
+    }
 }