Merge pull request #281 from mattpolzin/fix-simplified-all-of-schema-…

…optionality Fix simplified allOf schema optionality
mattpolzin · Jul 19, 2023 · 7e3969e · 7e3969e
2 parents 70b9c43 + 1a379dd
commit 7e3969e
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 2 deletions.
diff --git a/Sources/OpenAPIKit/Schema Object/JSONSchema.swift b/Sources/OpenAPIKit/Schema Object/JSONSchema.swift
@@ -365,7 +365,7 @@ extension JSONSchema {
         case .fragment(let context):
             return .fragment(context.optionalContext())
         case .all(of: let fragments, core: let core):
-            return .all(of: fragments, core: core.optionalContext())
+            return .all(of: fragments.map { $0.optionalSchemaObject() }, core: core.optionalContext())
         case .one(of: let schemas, core: let core):
             return .one(of: schemas, core: core.optionalContext())
         case .any(of: let schemas, core: let core):
@@ -395,7 +395,7 @@ extension JSONSchema {
         case .fragment(let context):
             return .fragment(context.requiredContext())
         case .all(of: let fragments, core: let core):
-            return .all(of: fragments, core: core.requiredContext())
+            return .all(of: fragments.map { $0.requiredSchemaObject() }, core: core.requiredContext())
         case .one(of: let schemas, core: let core):
             return .one(of: schemas, core: core.requiredContext())
         case .any(of: let schemas, core: let core):

diff --git a/Tests/OpenAPIKitTests/Schema Object/JSONSchemaTests.swift b/Tests/OpenAPIKitTests/Schema Object/JSONSchemaTests.swift
@@ -911,6 +911,16 @@ final class SchemaObjectTests: XCTestCase {
         XCTAssertFalse(not.required)
         XCTAssertFalse(fragment.required)
 
+        // all fragments within required get flipped too:
+        switch(allOf) {
+        case .all(of: let schemas, core: _):
+            for schema in schemas {
+                XCTAssertFalse(schema.required)
+            }
+        default:
+            break
+        }
+
         XCTAssertTrue(reference.required)
     }
 
@@ -951,6 +961,16 @@ final class SchemaObjectTests: XCTestCase {
         XCTAssertTrue(not.required)
         XCTAssertTrue(reference.required)
         XCTAssertTrue(fragment.required)
+
+        // all fragments within required get flipped too:
+        switch(allOf) {
+        case .all(of: let schemas, core: _):
+            for schema in schemas {
+                XCTAssertTrue(schema.required)
+            }
+        default:
+            break
+        }
     }
 
     func test_notNullableToNullable() {
@@ -4597,6 +4617,12 @@ extension SchemaObjectTests {
                 .reference(.component(named: "test"))
             ]
         )
+        let allOfWithReferenceAndDescription = JSONSchema.all(
+            of: [
+                .fragment(description: "hello"),
+                .reference(.component(named: "test"))
+            ]
+        )
 
         testEncodingPropertyLines(entity: allOf, propertyLines: [
             "\"allOf\" : [",
@@ -4660,6 +4686,17 @@ extension SchemaObjectTests {
             "  }",
             "]"
         ])
+
+        testEncodingPropertyLines(entity: allOfWithReferenceAndDescription, propertyLines: [
+            "\"allOf\" : [",
+            "  {",
+            "    \"description\" : \"hello\"",
+            "  },",
+            "  {",
+            "    \"$ref\" : \"#\\/components\\/schemas\\/test\"",
+            "  }",
+            "]"
+        ])
     }
 
     func test_decodeAll() throws {
@@ -4701,10 +4738,35 @@ extension SchemaObjectTests {
         }
         """.data(using: .utf8)!
 
+        let allWithReferenceAndDescriptionData = """
+        {
+            "allOf": [
+                { "description": "hello" },
+                { "$ref": "#/components/schemas/test" }
+            ]
+        }
+        """.data(using: .utf8)!
+
+        let nestedOptionalAllData = """
+        {
+            "type": "object",
+            "properties": {
+                "prop1": {
+                    "allOf": [
+                        { "description": "hello" },
+                        { "$ref": "#/components/schemas/test" }
+                    ]
+                }
+            }
+        }
+        """.data(using: .utf8)!
+
         let all = try orderUnstableDecode(JSONSchema.self, from: allData)
         let allWithTitle = try orderUnstableDecode(JSONSchema.self, from: allWithTitleData)
         let allWithDiscriminator = try orderUnstableDecode(JSONSchema.self, from: allWithDiscriminatorData)
         let allWithReference = try orderUnstableDecode(JSONSchema.self, from: allWithReferenceData)
+        let allWithReferenceAndDescription = try orderUnstableDecode(JSONSchema.self, from: allWithReferenceAndDescriptionData)
+        let nestedOptionalAll = try orderUnstableDecode(JSONSchema.self, from: nestedOptionalAllData)
 
         XCTAssertEqual(
             all,
@@ -4747,6 +4809,29 @@ extension SchemaObjectTests {
                 ]
             )
         )
+
+        XCTAssertEqual(
+            allWithReferenceAndDescription,
+            JSONSchema.all(
+                of: [
+                    .fragment(description: "hello"),
+                    .reference(.component(named: "test"))
+                ]
+            )
+        )
+
+        XCTAssertEqual(
+            nestedOptionalAll,
+            JSONSchema.object(
+                properties: [
+                    "prop1": JSONSchema.all(
+                        of: .fragment(required: false, description: "hello"),
+                            .reference(.component(named: "test")),
+                        required: false
+                    )
+                ]
+            )
+        )
     }
 
     func test_encodeOne() {