use Encoder and Decoder userInfo to configure VendorExtension support…

… for OpenAPIKit moudle

Sources/OpenAPIKit/CodableVendorExtendable.swift

@@ -21,8 +21,21 @@ public protocol VendorExtendable {
     var vendorExtensions: VendorExtensions { get set }
 }
 
+/// OpenAPIKit supports some additional Encoder/Decoder configuration above and beyond
+/// what the Encoder or Decoder support out of box.
+///
+/// To _disable_ encoding or decoding of Vendor Extensions (by default these are _enabled),
+/// set `userInfo[VendorExtensionsConfiguration.enabledKey] = false` for your encoder or decoder.
 public enum VendorExtensionsConfiguration {
-    public static var isEnabled = true
+    public static let enabledKey: CodingUserInfoKey = .init(rawValue: "vendor-extensions-enabled")!
+
+    static func isEnabled(for decoder: Decoder) -> Bool {
+        decoder.userInfo[enabledKey] as? Bool ?? true
+    }
+
+    static func isEnabled(for encoder: Encoder) -> Bool {
+        encoder.userInfo[enabledKey] as? Bool ?? true
+    }
 }
 
 internal protocol ExtendableCodingKey: CodingKey, Equatable {
@@ -75,7 +88,7 @@ internal enum VendorExtensionDecodingError: Swift.Error, CustomStringConvertible
 extension CodableVendorExtendable {
 
     internal static func extensions(from decoder: Decoder) throws -> VendorExtensions {
-        guard VendorExtensionsConfiguration.isEnabled else {
+        guard VendorExtensionsConfiguration.isEnabled(for: decoder) else {
             return [:]
         }
 
@@ -109,9 +122,6 @@ extension CodableVendorExtendable {
     }
 
     internal func encodeExtensions<T: KeyedEncodingContainerProtocol>(to container: inout T) throws where T.Key == Self.CodingKeys {
-        guard VendorExtensionsConfiguration.isEnabled else {
-            return
-        }
         for (key, value) in vendorExtensions {
             let xKey = key.starts(with: "x-") ? key : "x-\(key)"
             try container.encode(value, forKey: .extendedKey(for: xKey))

Sources/OpenAPIKit/Components Object/Components.swift

@@ -180,7 +180,9 @@ extension OpenAPI.Components: Encodable {
             try container.encode(pathItems, forKey: .pathItems)
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Content/Content.swift

@@ -161,7 +161,9 @@ extension OpenAPI.Content: Encodable {
 
         try container.encodeIfPresent(encoding, forKey: .encoding)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Document/Document.swift

@@ -456,7 +456,9 @@ extension OpenAPI.Document: Encodable {
             try container.encode(paths, forKey: .paths)
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
 
         if !components.isEmpty {
             try container.encode(components, forKey: .components)

Sources/OpenAPIKit/Document/DocumentInfo.swift

@@ -191,7 +191,9 @@ extension OpenAPI.Document.Info.License: Encodable {
             }
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 
@@ -269,7 +271,9 @@ extension OpenAPI.Document.Info.Contact: Encodable {
         try container.encodeIfPresent(url?.absoluteString, forKey: .url)
         try container.encodeIfPresent(email, forKey: .email)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 
@@ -345,7 +349,9 @@ extension OpenAPI.Document.Info: Encodable {
         try container.encodeIfPresent(license, forKey: .license)
         try container.encode(version, forKey: .version)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Example.swift

@@ -106,7 +106,9 @@ extension OpenAPI.Example: Encodable {
             break
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/ExternalDocumentation.swift

@@ -57,7 +57,9 @@ extension OpenAPI.ExternalDocumentation: Encodable {
         try container.encodeIfPresent(description, forKey: .description)
         try container.encode(url.absoluteString, forKey: .url)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Header/Header.swift

@@ -289,7 +289,9 @@ extension OpenAPI.Header: Encodable {
             try container.encode(deprecated, forKey: .deprecated)
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Link.swift

@@ -174,7 +174,9 @@ extension OpenAPI.Link: Encodable {
         try container.encodeIfPresent(description, forKey: .description)
         try container.encodeIfPresent(server, forKey: .server)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Operation/Operation.swift

@@ -291,7 +291,9 @@ extension OpenAPI.Operation: Encodable {
 
         try container.encodeIfPresent(servers, forKey: .servers)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Parameter/Parameter.swift

@@ -274,7 +274,9 @@ extension OpenAPI.Parameter: Encodable {
             try container.encode(deprecated, forKey: .deprecated)
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Path Item/PathItem.swift

@@ -275,7 +275,9 @@ extension OpenAPI.PathItem: Encodable {
         try container.encodeIfPresent(patch, forKey: .patch)
         try container.encodeIfPresent(trace, forKey: .trace)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Request/Request.swift

@@ -107,7 +107,9 @@ extension OpenAPI.Request: Encodable {
             try container.encode(required, forKey: .required)
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Response/Response.swift

@@ -168,7 +168,9 @@ extension OpenAPI.Response: Encodable {
             try container.encode(links, forKey: .links)
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Schema Object/JSONSchema.swift

@@ -1930,7 +1930,7 @@ extension JSONSchema: Encodable {
 
         // Ad-hoc vendor extension encoding because keys are done differently for
         // JSONSchema
-        guard VendorExtensionsConfiguration.isEnabled else {
+        guard VendorExtensionsConfiguration.isEnabled(for: encoder) else {
             return
         }
         var container = encoder.container(keyedBy: VendorExtensionKeys.self)
@@ -2140,7 +2140,7 @@ extension JSONSchema: Decodable {
         // Ad-hoc vendor extension support since JSONSchema does coding keys differently. 
         let extensions: [String: AnyCodable]
 
-        guard VendorExtensionsConfiguration.isEnabled else {
+        guard VendorExtensionsConfiguration.isEnabled(for: decoder) else {
             self.value = value
             return
         }

Sources/OpenAPIKit/Security/SecurityScheme.swift

@@ -125,7 +125,9 @@ extension OpenAPI.SecurityScheme: Encodable {
             try container.encode(SecurityType.Name.mutualTLS, forKey: .type)
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Server.swift

@@ -118,7 +118,9 @@ extension OpenAPI.Server: Encodable {
             try container.encode(variables, forKey: .variables)
         }
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 
@@ -194,7 +196,9 @@ extension OpenAPI.Server.Variable: Encodable {
 
         try container.encodeIfPresent(description, forKey: .description)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Sources/OpenAPIKit/Tag.swift

@@ -69,7 +69,9 @@ extension OpenAPI.Tag: Encodable {
 
         try container.encodeIfPresent(externalDocs, forKey: .externalDocs)
 
-        try encodeExtensions(to: &container)
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }
 

Tests/OpenAPIKitTests/Schema Object/JSONSchemaTests.swift

@@ -1741,14 +1741,12 @@ extension SchemaObjectTests {
         }
         """.data(using: .utf8)!
 
-        VendorExtensionsConfiguration.isEnabled = false
+        let config = [VendorExtensionsConfiguration.enabledKey: false]
 
-        let vendorExtended = try orderUnstableDecode(JSONSchema.self, from: vendorExtendedData)
-        let nonVendorExtended = try orderUnstableDecode(JSONSchema.self, from: nonVendorExtendedData)
+        let vendorExtended = try orderUnstableDecode(JSONSchema.self, from: vendorExtendedData, userInfo: config)
+        let nonVendorExtended = try orderUnstableDecode(JSONSchema.self, from: nonVendorExtendedData, userInfo: config)
 
         XCTAssertEqual(vendorExtended, nonVendorExtended)
-
-        VendorExtensionsConfiguration.isEnabled = true
     }
 
     func test_decodingWarnsForTypeAndPropertyConflict() throws {

Tests/OpenAPIKitTests/TestHelpers.swift

@@ -40,8 +40,9 @@ func orderStableYAMLEncode<T: Encodable>(_ value: T) throws -> String {
     return try yamsTestEncoder.encode(value)
 }
 
-fileprivate let foundationTestDecoder = { () -> JSONDecoder in
+fileprivate func buildFoundationTestDecoder(_ userInfo: [CodingUserInfoKey: Any] = [:]) -> JSONDecoder {
     let decoder = JSONDecoder()
+    decoder.userInfo = userInfo
     if #available(macOS 10.12, *) {
         decoder.dateDecodingStrategy = .iso8601
         decoder.keyDecodingStrategy = .useDefaultKeys
@@ -51,10 +52,12 @@ fileprivate let foundationTestDecoder = { () -> JSONDecoder in
     decoder.keyDecodingStrategy = .useDefaultKeys
     #endif
     return decoder
-}()
+}
+
+fileprivate let foundationTestDecoder = { () -> JSONDecoder in buildFoundationTestDecoder() }()
 
-func orderUnstableDecode<T: Decodable>(_ type: T.Type, from data: Data) throws -> T {
-    return try foundationTestDecoder.decode(T.self, from: data)
+func orderUnstableDecode<T: Decodable>(_ type: T.Type, from data: Data, userInfo : [CodingUserInfoKey: Any] = [:]) throws -> T {
+    return try buildFoundationTestDecoder(userInfo).decode(T.self, from: data)
 }
 
 fileprivate let yamsTestDecoder = { () -> YAMLDecoder in

Tests/OpenAPIKitTests/VendorExtendableTests.swift

@@ -159,6 +159,9 @@ private struct TestStruct: Codable, CodableVendorExtendable {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode("world", forKey: .one)
         try container.encode("!", forKey: .two)
-        try encodeExtensions(to: &container)
+
+        if VendorExtensionsConfiguration.isEnabled(for: encoder) {
+            try encodeExtensions(to: &container)
+        }
     }
 }