Fix decoding of enum with associated values when enum case does not c…

…ontain value
CoreOffice · Apr 26, 2023 · 2cba711 · 2cba711
1 parent 666227d
commit 2cba711
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/Sources/XMLCoder/Decoder/XMLKeyedDecodingContainer.swift b/Sources/XMLCoder/Decoder/XMLKeyedDecodingContainer.swift
@@ -144,6 +144,13 @@ struct XMLKeyedDecodingContainer<K: CodingKey>: KeyedDecodingContainerProtocol {
                 referencing: decoder,
                 wrapping: SharedBox(keyedContainer)
             )
+        } else if let singleBox = value as? SingleKeyedBox {
+            let element = (singleBox.key, singleBox.element)
+            let keyedContainer = KeyedBox(elements: [element], attributes: [])
+            container = XMLKeyedDecodingContainer<NestedKey>(
+                referencing: decoder,
+                wrapping: SharedBox(keyedContainer)
+            )
         } else {
             throw DecodingError.typeMismatch(
                 at: codingPath,

diff --git a/Tests/XMLCoderTests/AdvancedFeatures/SimpleChoiceTests.swift b/Tests/XMLCoderTests/AdvancedFeatures/SimpleChoiceTests.swift
@@ -85,4 +85,23 @@ final class SimpleChoiceTests: XCTestCase {
         let decoded = try XMLDecoder().decode([[IntOrString]].self, from: encoded)
         XCTAssertEqual(original, decoded)
     }
+
+    func testMixedChoice() throws {
+        enum Choice: Equatable, Codable {
+            case one
+            case two(Int)
+            case three(String, value: Int)
+        }
+
+        struct Foo: Equatable, Codable {
+            var one = Choice.one
+            var two = Choice.two(10)
+            var three = Choice.three("qq", value: 20)
+        }
+
+        let original = Foo()
+        let encoded = try XMLEncoder().encode(original, withRootKey: "container")
+        let decoded = try XMLDecoder().decode(Foo.self, from: encoded)
+        XCTAssertEqual(original, decoded)
+    }
 }