Merge pull request #352 from mattpolzin/fix-inferred-bug

mattpolzin · web-flow · commit 283454875cc6 · 2023-12-07T14:32:30.000-06:00
keep inferred when updating any other property of a core context using a helper function
diff --git a/Sources/OpenAPIKit/Schema Object/JSONSchemaContext.swift b/Sources/OpenAPIKit/Schema Object/JSONSchemaContext.swift
@@ -296,7 +296,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -315,7 +316,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -334,7 +336,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -353,7 +356,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -372,7 +376,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -391,7 +396,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: [example],
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -410,7 +416,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -429,7 +436,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -448,7 +456,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 
@@ -467,7 +476,8 @@ extension JSONSchema.CoreContext {
             allowedValues: allowedValues,
             defaultValue: defaultValue,
             examples: examples,
-            vendorExtensions: vendorExtensions
+            vendorExtensions: vendorExtensions,
+            _inferred: inferred
         )
     }
 }
diff --git a/Sources/OpenAPIKit30/Schema Object/JSONSchemaContext.swift b/Sources/OpenAPIKit30/Schema Object/JSONSchemaContext.swift
@@ -273,7 +273,8 @@ extension JSONSchema.CoreContext {
             externalDocs: externalDocs,
             allowedValues: allowedValues,
             defaultValue: defaultValue,
-            example: example
+            example: example,
+            _inferred: inferred
         )
     }
 
@@ -291,7 +292,8 @@ extension JSONSchema.CoreContext {
             externalDocs: externalDocs,
             allowedValues: allowedValues,
             defaultValue: defaultValue,
-            example: example
+            example: example,
+            _inferred: inferred
         )
     }
 
@@ -309,7 +311,8 @@ extension JSONSchema.CoreContext {
             externalDocs: externalDocs,
             allowedValues: allowedValues,
             defaultValue: defaultValue,
-            example: example
+            example: example,
+            _inferred: inferred
         )
     }
 
@@ -327,7 +330,8 @@ extension JSONSchema.CoreContext {
             externalDocs: externalDocs,
             allowedValues: allowedValues,
             defaultValue: defaultValue,
-            example: example
+            example: example,
+            _inferred: inferred
         )
     }
 
@@ -345,7 +349,8 @@ extension JSONSchema.CoreContext {
             externalDocs: externalDocs,
             allowedValues: allowedValues,
             defaultValue: defaultValue,
-            example: example
+            example: example,
+            _inferred: inferred
         )
     }
 
@@ -363,7 +368,8 @@ extension JSONSchema.CoreContext {
             externalDocs: externalDocs,
             allowedValues: allowedValues,
             defaultValue: defaultValue,
-            example: example
+            example: example,
+            _inferred: inferred
         )
     }
 
@@ -381,7 +387,8 @@ extension JSONSchema.CoreContext {
             externalDocs: externalDocs,
             allowedValues: allowedValues,
             defaultValue: defaultValue,
-            example: example
+            example: example,
+            _inferred: inferred
         )
     }
 }
diff --git a/Tests/OpenAPIKitCompatTests/DocumentConversionTests.swift b/Tests/OpenAPIKitCompatTests/DocumentConversionTests.swift
@@ -762,7 +762,28 @@ final class DocumentConversionTests: XCTestCase {
     }
 
     func test_JSONSchemaFragment() throws {
-        // TODO: write test
+        let inferredFragment = OpenAPIKit30.JSONSchema.fragment(.init(_inferred: true))
+
+        let oldDoc = OpenAPIKit30.OpenAPI.Document(
+            info: .init(title: "Hello", version: "1.0.0"),
+            servers: [],
+            paths: [:],
+            components: .init(
+                schemas: [
+                    "schema1": inferredFragment,
+                ]
+            )
+        )
+
+        let newDoc = oldDoc.convert(to: .v3_1_0)
+
+        try assertEqualNewToOld(newDoc, oldDoc)
+
+        let newInferredFragment = try XCTUnwrap(newDoc.components.schemas["schema1"])
+
+        try assertEqualNewToOld(newInferredFragment, inferredFragment)
+
+        // TODO: write more tests
     }
 
     func test_Operation() throws {
@@ -1192,6 +1213,7 @@ fileprivate func assertEqualNewToOld(_ newCoreContext: OpenAPIKit.JSONSchemaCont
     XCTAssertEqual(newCoreContext.readOnly, oldCoreContext.readOnly)
     XCTAssertEqual(newCoreContext.writeOnly, oldCoreContext.writeOnly)
     XCTAssertEqual(newCoreContext.deprecated, oldCoreContext.deprecated)
+    XCTAssertEqual(newCoreContext.inferred, oldCoreContext.inferred)
 }
 
 fileprivate func assertEqualNewToOld(_ newStringContext: OpenAPIKit.JSONSchema.StringContext, _ oldStringContext: OpenAPIKit30.JSONSchema.StringContext) {

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,8 @@ extension JSONSchema.CoreContext {`
`296`	`296`	`allowedValues: allowedValues,`
`297`	`297`	`defaultValue: defaultValue,`
`298`	`298`	`examples: examples,`
`299`		`- vendorExtensions: vendorExtensions`
	`299`	`+ vendorExtensions: vendorExtensions,`
	`300`	`+ _inferred: inferred`
`300`	`301`	`)`
`301`	`302`	`}`
`302`	`303`
`@@ -315,7 +316,8 @@ extension JSONSchema.CoreContext {`
`315`	`316`	`allowedValues: allowedValues,`
`316`	`317`	`defaultValue: defaultValue,`
`317`	`318`	`examples: examples,`
`318`		`- vendorExtensions: vendorExtensions`
	`319`	`+ vendorExtensions: vendorExtensions,`
	`320`	`+ _inferred: inferred`
`319`	`321`	`)`
`320`	`322`	`}`
`321`	`323`
`@@ -334,7 +336,8 @@ extension JSONSchema.CoreContext {`
`334`	`336`	`allowedValues: allowedValues,`
`335`	`337`	`defaultValue: defaultValue,`
`336`	`338`	`examples: examples,`
`337`		`- vendorExtensions: vendorExtensions`
	`339`	`+ vendorExtensions: vendorExtensions,`
	`340`	`+ _inferred: inferred`
`338`	`341`	`)`
`339`	`342`	`}`
`340`	`343`
`@@ -353,7 +356,8 @@ extension JSONSchema.CoreContext {`
`353`	`356`	`allowedValues: allowedValues,`
`354`	`357`	`defaultValue: defaultValue,`
`355`	`358`	`examples: examples,`
`356`		`- vendorExtensions: vendorExtensions`
	`359`	`+ vendorExtensions: vendorExtensions,`
	`360`	`+ _inferred: inferred`
`357`	`361`	`)`
`358`	`362`	`}`
`359`	`363`
`@@ -372,7 +376,8 @@ extension JSONSchema.CoreContext {`
`372`	`376`	`allowedValues: allowedValues,`
`373`	`377`	`defaultValue: defaultValue,`
`374`	`378`	`examples: examples,`
`375`		`- vendorExtensions: vendorExtensions`
	`379`	`+ vendorExtensions: vendorExtensions,`
	`380`	`+ _inferred: inferred`
`376`	`381`	`)`
`377`	`382`	`}`
`378`	`383`
`@@ -391,7 +396,8 @@ extension JSONSchema.CoreContext {`
`391`	`396`	`allowedValues: allowedValues,`
`392`	`397`	`defaultValue: defaultValue,`
`393`	`398`	`examples: [example],`
`394`		`- vendorExtensions: vendorExtensions`
	`399`	`+ vendorExtensions: vendorExtensions,`
	`400`	`+ _inferred: inferred`
`395`	`401`	`)`
`396`	`402`	`}`
`397`	`403`
`@@ -410,7 +416,8 @@ extension JSONSchema.CoreContext {`
`410`	`416`	`allowedValues: allowedValues,`
`411`	`417`	`defaultValue: defaultValue,`
`412`	`418`	`examples: examples,`
`413`		`- vendorExtensions: vendorExtensions`
	`419`	`+ vendorExtensions: vendorExtensions,`
	`420`	`+ _inferred: inferred`
`414`	`421`	`)`
`415`	`422`	`}`
`416`	`423`
`@@ -429,7 +436,8 @@ extension JSONSchema.CoreContext {`
`429`	`436`	`allowedValues: allowedValues,`
`430`	`437`	`defaultValue: defaultValue,`
`431`	`438`	`examples: examples,`
`432`		`- vendorExtensions: vendorExtensions`
	`439`	`+ vendorExtensions: vendorExtensions,`
	`440`	`+ _inferred: inferred`
`433`	`441`	`)`
`434`	`442`	`}`
`435`	`443`
`@@ -448,7 +456,8 @@ extension JSONSchema.CoreContext {`
`448`	`456`	`allowedValues: allowedValues,`
`449`	`457`	`defaultValue: defaultValue,`
`450`	`458`	`examples: examples,`
`451`		`- vendorExtensions: vendorExtensions`
	`459`	`+ vendorExtensions: vendorExtensions,`
	`460`	`+ _inferred: inferred`
`452`	`461`	`)`
`453`	`462`	`}`
`454`	`463`
`@@ -467,7 +476,8 @@ extension JSONSchema.CoreContext {`
`467`	`476`	`allowedValues: allowedValues,`
`468`	`477`	`defaultValue: defaultValue,`
`469`	`478`	`examples: examples,`
`470`		`- vendorExtensions: vendorExtensions`
	`479`	`+ vendorExtensions: vendorExtensions,`
	`480`	`+ _inferred: inferred`
`471`	`481`	`)`
`472`	`482`	`}`
`473`	`483`	`}`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,8 @@ extension JSONSchema.CoreContext {`
`273`	`273`	`externalDocs: externalDocs,`
`274`	`274`	`allowedValues: allowedValues,`
`275`	`275`	`defaultValue: defaultValue,`
`276`		`- example: example`
	`276`	`+ example: example,`
	`277`	`+ _inferred: inferred`
`277`	`278`	`)`
`278`	`279`	`}`
`279`	`280`
`@@ -291,7 +292,8 @@ extension JSONSchema.CoreContext {`
`291`	`292`	`externalDocs: externalDocs,`
`292`	`293`	`allowedValues: allowedValues,`
`293`	`294`	`defaultValue: defaultValue,`
`294`		`- example: example`
	`295`	`+ example: example,`
	`296`	`+ _inferred: inferred`
`295`	`297`	`)`
`296`	`298`	`}`
`297`	`299`
`@@ -309,7 +311,8 @@ extension JSONSchema.CoreContext {`
`309`	`311`	`externalDocs: externalDocs,`
`310`	`312`	`allowedValues: allowedValues,`
`311`	`313`	`defaultValue: defaultValue,`
`312`		`- example: example`
	`314`	`+ example: example,`
	`315`	`+ _inferred: inferred`
`313`	`316`	`)`
`314`	`317`	`}`
`315`	`318`
`@@ -327,7 +330,8 @@ extension JSONSchema.CoreContext {`
`327`	`330`	`externalDocs: externalDocs,`
`328`	`331`	`allowedValues: allowedValues,`
`329`	`332`	`defaultValue: defaultValue,`
`330`		`- example: example`
	`333`	`+ example: example,`
	`334`	`+ _inferred: inferred`
`331`	`335`	`)`
`332`	`336`	`}`
`333`	`337`
`@@ -345,7 +349,8 @@ extension JSONSchema.CoreContext {`
`345`	`349`	`externalDocs: externalDocs,`
`346`	`350`	`allowedValues: allowedValues,`
`347`	`351`	`defaultValue: defaultValue,`
`348`		`- example: example`
	`352`	`+ example: example,`
	`353`	`+ _inferred: inferred`
`349`	`354`	`)`
`350`	`355`	`}`
`351`	`356`
`@@ -363,7 +368,8 @@ extension JSONSchema.CoreContext {`
`363`	`368`	`externalDocs: externalDocs,`
`364`	`369`	`allowedValues: allowedValues,`
`365`	`370`	`defaultValue: defaultValue,`
`366`		`- example: example`
	`371`	`+ example: example,`
	`372`	`+ _inferred: inferred`
`367`	`373`	`)`
`368`	`374`	`}`
`369`	`375`
`@@ -381,7 +387,8 @@ extension JSONSchema.CoreContext {`
`381`	`387`	`externalDocs: externalDocs,`
`382`	`388`	`allowedValues: allowedValues,`
`383`	`389`	`defaultValue: defaultValue,`
`384`		`- example: example`
	`390`	`+ example: example,`
	`391`	`+ _inferred: inferred`
`385`	`392`	`)`
`386`	`393`	`}`
`387`	`394`	`}`