fix component name tracking for jsonschema reference dereferencing

Author: mattpolzin

Sources/OpenAPIKit/Schema Object/DereferencedJSONSchema.swift

@@ -485,10 +485,10 @@ extension JSONSchema: LocallyDereferenceable {
             // TODO: consider which other core context properties to override here as with description ^
 
             var extensions = dereferenced.vendorExtensions
-            if let name {
+            if let name = name ?? reference.name {
                 extensions[OpenAPI.Components.componentNameExtension] = .init(name)
             }
-            dereferenced = dereferenced.with(vendorExtensions: vendorExtensions)
+            dereferenced = dereferenced.with(vendorExtensions: extensions)
 
             return dereferenced
         case .boolean(let context):

Tests/OpenAPIKitTests/Schema Object/DereferencedSchemaObjectTests.swift

@@ -278,15 +278,15 @@ final class DereferencedSchemaObjectTests: XCTestCase {
             schemas: ["test": .string]
         )
         let t1 = try JSONSchema.reference(.component(named: "test")).dereferenced(in: components)
-        XCTAssertEqual(t1, .string(.init(), .init()))
+        XCTAssertEqual(t1, .string(.init(vendorExtensions: ["x-component-name": "test"]), .init()))
     }
 
     func test_throwingReferenceWithOverriddenDescription() throws {
         let components = OpenAPI.Components(
             schemas: ["test": .string]
         )
         let t1 = try JSONSchema.reference(.component(named: "test"), description: "hello").dereferenced(in: components)
-        XCTAssertEqual(t1, .string(.init(description: "hello"), .init()))
+        XCTAssertEqual(t1, .string(.init(description: "hello", vendorExtensions: ["x-component-name": "test"]), .init()))
     }
 
     func test_optionalObjectWithoutReferences() {
@@ -360,7 +360,7 @@ final class DereferencedSchemaObjectTests: XCTestCase {
         let t1 = try JSONSchema.object(properties: ["test": .reference(.component(named: "test"))]).dereferenced(in: components)
         XCTAssertEqual(
             t1,
-            .object(.init(), DereferencedJSONSchema.ObjectContext(.init(properties: ["test": .boolean]))!)
+            .object(.init(), DereferencedJSONSchema.ObjectContext(.init(properties: ["test": .boolean(.init(vendorExtensions: ["x-component-name": "test"]))]))!)
         )
         XCTAssertThrowsError(try JSONSchema.object(properties: ["missing": .reference(.component(named: "missing"))]).dereferenced(in: components))
     }
@@ -394,7 +394,7 @@ final class DereferencedSchemaObjectTests: XCTestCase {
         let t1 = try JSONSchema.array(items: .reference(.component(named: "test"))).dereferenced(in: components)
         XCTAssertEqual(
             t1,
-            .array(.init(), DereferencedJSONSchema.ArrayContext(.init(items: .boolean))!)
+            .array(.init(), DereferencedJSONSchema.ArrayContext(.init(items: .boolean(.init(vendorExtensions: ["x-component-name": "test"]))))!)
         )
         XCTAssertThrowsError(try JSONSchema.array(items: .reference(.component(named: "missing"))).dereferenced(in: components))
     }
@@ -427,7 +427,7 @@ final class DereferencedSchemaObjectTests: XCTestCase {
         let t1 = try JSONSchema.one(of: .reference(.component(named: "test"))).dereferenced(in: components)
         XCTAssertEqual(
             t1,
-            .one(of: [.boolean(.init())], core: .init())
+            .one(of: [.boolean(.init(vendorExtensions: ["x-component-name": "test"]))], core: .init())
         )
         XCTAssertEqual(t1.coreContext as? JSONSchema.CoreContext<JSONTypeFormat.AnyFormat>, .init())
         XCTAssertThrowsError(try JSONSchema.one(of: .reference(.component(named: "missing"))).dereferenced(in: components))
@@ -461,7 +461,7 @@ final class DereferencedSchemaObjectTests: XCTestCase {
         let t1 = try JSONSchema.any(of: .reference(.component(named: "test"))).dereferenced(in: components)
         XCTAssertEqual(
             t1,
-            .any(of: [.boolean(.init())], core: .init())
+            .any(of: [.boolean(.init(vendorExtensions: ["x-component-name": "test"]))], core: .init())
         )
         XCTAssertEqual(t1.coreContext as? JSONSchema.CoreContext<JSONTypeFormat.AnyFormat>, .init())
         XCTAssertThrowsError(try JSONSchema.any(of: .reference(.component(named: "missing"))).dereferenced(in: components))
@@ -489,7 +489,7 @@ final class DereferencedSchemaObjectTests: XCTestCase {
         let t1 = try JSONSchema.not(.reference(.component(named: "test"))).dereferenced(in: components)
         XCTAssertEqual(
             t1,
-            .not(.boolean(.init()), core: .init())
+            .not(.boolean(.init(vendorExtensions: ["x-component-name": "test"])), core: .init())
         )
         XCTAssertEqual(t1.coreContext as? JSONSchema.CoreContext<JSONTypeFormat.AnyFormat>, .init())
         XCTAssertThrowsError(try JSONSchema.not(.reference(.component(named: "missing"))).dereferenced(in: components))

Tests/OpenAPIKitTests/Schema Object/SchemaFragmentCombiningTests.swift

@@ -575,7 +575,7 @@ final class SchemaFragmentCombiningTests: XCTestCase {
         let schema1 = try t1.combined(resolvingAgainst: components)
         XCTAssertEqual(
             schema1,
-            JSONSchema.string.dereferenced()
+            JSONSchema.string(.init(vendorExtensions: ["x-component-name": "test"]), .init()).dereferenced()
         )
 
         let t2 = [
@@ -585,7 +585,7 @@ final class SchemaFragmentCombiningTests: XCTestCase {
         let schema2 = try t2.combined(resolvingAgainst: components)
         XCTAssertEqual(
             schema2,
-            JSONSchema.object(description: "test", properties: ["test": .string]).dereferenced()
+            JSONSchema.object(description: "test", properties: ["test": .string(.init(vendorExtensions: ["x-component-name": "test"]), .init())]).dereferenced()
         )
     }