port #409 to the OAS 3.0 module

Author: mattpolzin

Sources/OpenAPIKit30/Schema Object/JSONSchema.swift

@@ -1761,7 +1761,9 @@ extension JSONSchema: Decodable {
                 schema = schema.nullableSchemaObject()
             }
 
-            self = schema
+            self = .init(warnings: schema.warnings,
+                         schema: schema.value,
+                         vendorExtensions: try Self.decodeVenderExtensions(from: decoder))
             return
         }
 
@@ -1774,7 +1776,9 @@ extension JSONSchema: Decodable {
                 schema = schema.nullableSchemaObject()
             }
 
-            self = schema
+            self = .init(warnings: schema.warnings,
+                         schema: schema.value,
+                         vendorExtensions: try Self.decodeVenderExtensions(from: decoder))
             return
         }
 
@@ -1787,7 +1791,9 @@ extension JSONSchema: Decodable {
                 schema = schema.nullableSchemaObject()
             }
 
-            self = schema
+            self = .init(warnings: schema.warnings,
+                         schema: schema.value,
+                         vendorExtensions: try Self.decodeVenderExtensions(from: decoder))
             return
         }
 
@@ -1797,7 +1803,9 @@ extension JSONSchema: Decodable {
                 core: try CoreContext<JSONTypeFormat.AnyFormat>(from: decoder)
             )
 
-            self = schema
+            self = .init(warnings: schema.warnings,
+                         schema: schema.value,
+                         vendorExtensions: try Self.decodeVenderExtensions(from: decoder))
             return
         }
 
@@ -1888,25 +1896,27 @@ extension JSONSchema: Decodable {
 
         self.warnings = _warnings
 
-        // Ad-hoc vendor extension support since JSONSchema does coding keys differently. 
+        self.vendorExtensions = try Self.decodeVenderExtensions(from: decoder)
+    }
+
+    private static func decodeVenderExtensions(from decoder: Decoder) throws -> [String: AnyCodable] {
         guard VendorExtensionsConfiguration.isEnabled else {
-            self.vendorExtensions = [:]
-            return
+            return [:]
         }
-
+        
         let decoded = try AnyCodable(from: decoder).value
-
+        
         guard (decoded as? [Any]) == nil else {
             throw VendorExtensionDecodingError.selfIsArrayNotDict
         }
-
+        
         guard let decodedAny = decoded as? [String: Any] else {
             throw VendorExtensionDecodingError.foundNonStringKeys
         }
-
-        let extensions = decodedAny.filter { $0.key.lowercased().starts(with: "x-") }
-
-        self.vendorExtensions = extensions.mapValues(AnyCodable.init)
+        
+        return decodedAny
+            .filter { $0.key.lowercased().starts(with: "x-") }
+            .mapValues(AnyCodable.init)
     }
 }
 

Tests/OpenAPIKit30Tests/Schema Object/JSONSchemaTests.swift

@@ -1508,6 +1508,61 @@ extension SchemaObjectTests {
         )
     }
 
+    func test_decodeAnyOfWithVendorExtension() throws {
+        let extensionSchema = """
+        {
+            "anyOf" : [
+                { "type": "string" },
+                { "type": "number" }
+            ],
+            "x-hello" : "hello"
+        }
+        """.data(using: .utf8)!
+
+        let desiredSchema = JSONSchema(schema: .any(of: [JSONSchema.string, JSONSchema.number], core: .init()), vendorExtensions: ["x-hello": "hello"])
+        XCTAssertEqual(
+            try orderUnstableDecode(JSONSchema.self, from: extensionSchema),
+            desiredSchema
+        )
+    }
+    
+    func test_decodeAllOfWithVendorExtension() throws {
+        let extensionSchema = """
+        {
+            "allOf" : [
+                { "type": "string" },
+                { "type": "number" }
+            ],
+            "x-hello" : "hello"
+        }
+        """.data(using: .utf8)!
+
+        let desiredSchema = JSONSchema(schema: .all(of: [JSONSchema.string, JSONSchema.number], core: .init()), vendorExtensions: ["x-hello": "hello"])
+        XCTAssertEqual(
+            try orderUnstableDecode(JSONSchema.self, from: extensionSchema),
+            desiredSchema
+        )
+    }
+    
+    func test_decodeOneOfWithVendorExtension() throws {
+        let extensionSchema = """
+        {
+            "oneOf" : [
+                { "type": "string" },
+                { "type": "number" }
+            ],
+            "x-hello" : "hello"
+        }
+        """.data(using: .utf8)!
+
+        let desiredSchema = JSONSchema(schema: .one(of: [JSONSchema.string, JSONSchema.number], core: .init()), vendorExtensions: ["x-hello": "hello"])
+        XCTAssertEqual(
+            try orderUnstableDecode(JSONSchema.self, from: extensionSchema),
+            desiredSchema
+        )
+    }
+
+
     func test_encodeBoolean() {
         let requiredBoolean = JSONSchema.boolean(.init(format: .unspecified, required: true))
         let optionalBoolean = JSONSchema.boolean(.init(format: .unspecified, required: false))

Tests/OpenAPIKitTests/Schema Object/JSONSchemaTests.swift

@@ -1918,6 +1918,24 @@ extension SchemaObjectTests {
             JSONSchema.fragment(.init(examples: ["hello"])).with(vendorExtensions: ["x-hello": "hello"])
         )
     }
+
+    func test_encodeExamplesVendorExtension() throws {
+        let fragment = JSONSchema.fragment(.init(examples: ["hello"])).with(vendorExtensions: ["x-hello": "hello"])
+
+        let encoded = try orderUnstableTestStringFromEncoding(of: fragment)
+
+        assertJSONEquivalent(
+            encoded,
+            """
+            {
+              "examples" : [
+                "hello"
+              ],
+              "x-hello" : "hello"
+            }
+            """
+        )
+    }
 
     func test_decodeAnyOfWithVendorExtension() throws {
         let extensionSchema = """
@@ -1970,24 +1988,6 @@ extension SchemaObjectTests {
         )
     }
 
-    func test_encodeExamplesVendorExtension() throws {
-        let fragment = JSONSchema.fragment(.init(examples: ["hello"])).with(vendorExtensions: ["x-hello": "hello"])
-
-        let encoded = try orderUnstableTestStringFromEncoding(of: fragment)
-
-        assertJSONEquivalent(
-            encoded,
-            """
-            {
-              "examples" : [
-                "hello"
-              ],
-              "x-hello" : "hello"
-            }
-            """
-        )
-    }
-
     func test_decodeNullType() throws {
         let nullTypeData = """
         {