Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/Encoder/DictionaryComponentEncoder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ extension DictionaryComponentEncoder {
case let url as URL:
return try encodeURL(url, at: codingPath)

case _ where self.options.nestedEncodingStrategy == .skip:
return .value(nil)

default:
return try encodeNonPrimitiveValue(value, at: codingPath)
}
Expand Down
9 changes: 8 additions & 1 deletion Sources/Encoder/DictionaryEncoder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ public final class DictionaryEncoder: Sendable {
set { optionsMutex.withLock { $0.keyEncodingStrategy = newValue } }
}

public var nestedEncodingStrategy: DictionaryNestedEncodingStrategy {
get { optionsMutex.withLock { $0.nestedEncodingStrategy } }
set { optionsMutex.withLock { $0.nestedEncodingStrategy = newValue } }
}

public var userInfo: [CodingUserInfoKey: Sendable] {
get { userInfoMutex.withLock { $0 } }
set { userInfoMutex.withLock { $0 = newValue } }
Expand All @@ -45,14 +50,16 @@ public final class DictionaryEncoder: Sendable {
nonConformingFloatEncodingStrategy: DictionaryNonConformingFloatEncodingStrategy = .throw,
nilEncodingStrategy: DictionaryNilEncodingStrategy = .useNil,
keyEncodingStrategy: DictionaryKeyEncodingStrategy = .useDefaultKeys,
nestedEncodingStrategy: DictionaryNestedEncodingStrategy = .encode,
userInfo: [CodingUserInfoKey: Sendable] = [:]
) {
let options = DictionaryEncodingOptions(
dateEncodingStrategy: dateEncodingStrategy,
dataEncodingStrategy: dataEncodingStrategy,
nonConformingFloatEncodingStrategy: nonConformingFloatEncodingStrategy,
nilEncodingStrategy: nilEncodingStrategy,
keyEncodingStrategy: keyEncodingStrategy
keyEncodingStrategy: keyEncodingStrategy,
nestedEncodingStrategy: nestedEncodingStrategy
)

self.optionsMutex = Mutex(value: options)
Expand Down
1 change: 1 addition & 0 deletions Sources/Encoder/Options/DictionaryEncodingOptions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ internal struct DictionaryEncodingOptions {
internal var nonConformingFloatEncodingStrategy: DictionaryNonConformingFloatEncodingStrategy
internal var nilEncodingStrategy: DictionaryNilEncodingStrategy
internal var keyEncodingStrategy: DictionaryKeyEncodingStrategy
internal var nestedEncodingStrategy: DictionaryNestedEncodingStrategy
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Foundation

public enum DictionaryNestedEncodingStrategy: Sendable {

// MARK: - Enumeration Cases

case encode
case skip
}
19 changes: 19 additions & 0 deletions Tests/Encoder/DictionaryEncoderStrategiesTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,25 @@ final class DictionaryEncoderStrategiesTests: XCTestCase, DictionaryEncoderTesti
assertEncoderSucceeds(encoding: EncodableStruct())
}

// MARK: -

func testThatEncoderSucceedsWhenSkippingNestedContainers() {
struct EncodableStruct: Encodable {
var test: String = "1"
var dict: [String: Int] = ["a": 1]
var array: [String] = ["b"]
}

encoder.nestedEncodingStrategy = .skip

assertEncoderSucceeds(
encoding: EncodableStruct(),
expecting: [
"test": "1"
])
}


// MARK: - XCTestCase

override func setUp() {
Expand Down