Skip to content

Remove simplification helpers from OpenAPIKit30 (OAS 3.0 only) #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattpolzin merged 1 commit into from
Aug 31, 2026
Merged

Remove simplification helpers from OpenAPIKit30 (OAS 3.0 only) #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
688 changes: 0 additions & 688 deletions Sources/OpenAPIKit30/Schema Object/JSONSchema+Combining.swift
View file
Open in desktop

This file was deleted.

143 changes: 0 additions & 143 deletions Sources/OpenAPIKit30/Schema Object/SimplifiedJSONSchema.swift
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions Tests/OpenAPIKit30RealSpecSuite/SwaggerDocSamplesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,34 +81,6 @@ final class SwaggerDocSamplesTests: XCTestCase {

XCTAssertEqual(resolvedDoc.routes.count, 1)
XCTAssertEqual(resolvedDoc.endpoints.count, 1)

let dogSchema = JSONSchema.object(
discriminator: .init(propertyName: "pet_type"),
properties: [
"pet_type": .string,
"bark": .boolean(required: false),
"breed": .string(required: false, allowedValues: "Dingo", "Husky", "Retriever", "Shepherd")
]
)
let catSchema = JSONSchema.object(
discriminator: .init(propertyName: "pet_type"),
properties: [
"pet_type": .string,
"hunts": .boolean(required: false),
"age": .integer(required: false)
]
)

XCTAssertEqual(
try resolvedDoc.endpoints[0].requestBody?.content[.json]?.schema?.simplified().jsonSchema,
JSONSchema.one(
of: [
catSchema,
dogSchema
],
core: .init(discriminator: .init(propertyName: "pet_type"))
)
)
} catch let error {
let friendlyError = OpenAPI.Error(from: error)
throw friendlyError
Expand Down
30 changes: 0 additions & 30 deletions Tests/OpenAPIKit30Tests/Schema Object/DereferencedSchemaObjectTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,6 @@ final class DereferencedSchemaObjectTests: XCTestCase {
let t20 = JSONSchema.all(of: [.string(.init(), .init())], core: .init(discriminator: .init(propertyName: "test"))).dereferenced()
XCTAssertEqual(t20, .all(of: [.string(.init(), .init())], core: .init(discriminator: .init(propertyName: "test"))))
XCTAssertEqual(t20?.discriminator, .init(propertyName: "test"))

// bonus tests around simplifying:
let t21 = try JSONSchema.all(of: []).dereferenced()?.simplified()
XCTAssertEqual(t21, .fragment(.init(description: nil)))
XCTAssertNil(t21?.discriminator)
XCTAssertNotNil(t21?.coreContext)

let t22 = try JSONSchema.all(of: [.string(.init(), .init())]).dereferenced()?.simplified()
XCTAssertEqual(t22, .string(.init(), .init()))
XCTAssertNil(t22?.discriminator)
XCTAssertEqual(t22?.coreContext as? JSONSchema.CoreContext<JSONTypeFormat.StringFormat>, .init())

let t23 = try JSONSchema.all(of: [.string(.init(), .init())], core: .init(discriminator: .init(propertyName: "test"))).dereferenced()?.simplified()
XCTAssertEqual(t23, .string(.init(discriminator: .init(propertyName: "test")), .init()))
XCTAssertEqual(t23?.discriminator, .init(propertyName: "test"))
}

func test_throwingBasicConstructionsFromSchemaObject() throws {
Expand Down Expand Up @@ -242,21 +227,6 @@ final class DereferencedSchemaObjectTests: XCTestCase {
let t20 = try JSONSchema.all(of: [.string(.init(), .init())], core: .init(discriminator: .init(propertyName: "test"))).dereferenced(in: components)
XCTAssertEqual(t20, .all(of: [.string(.init(), .init())], core: .init(discriminator: .init(propertyName: "test"))))
XCTAssertEqual(t20.discriminator, .init(propertyName: "test"))

// bonus tests around simplifying:
let t21 = try JSONSchema.all(of: []).dereferenced(in: components).simplified()
XCTAssertEqual(t21, .fragment(.init(description: nil)))
XCTAssertNil(t21.discriminator)
XCTAssertNotNil(t21.coreContext)

let t22 = try JSONSchema.all(of: [.string(.init(), .init())]).dereferenced(in: components).simplified()
XCTAssertEqual(t22, .string(.init(), .init()))
XCTAssertNil(t22.discriminator)
XCTAssertEqual(t22.coreContext as? JSONSchema.CoreContext<JSONTypeFormat.StringFormat>, .init())

let t23 = try JSONSchema.all(of: [.string(.init(), .init())], core: .init(discriminator: .init(propertyName: "test"))).dereferenced(in: components).simplified()
XCTAssertEqual(t23, .string(.init(discriminator: .init(propertyName: "test")), .init()))
XCTAssertEqual(t23.discriminator, .init(propertyName: "test"))
}

func test_optionalReferenceMissing() {
Expand Down
Loading