Support OpenAPI 3.1 in addition to 3.0

Package.swift

@@ -91,7 +91,9 @@ let package = Package(
         .target(
             name: "_OpenAPIGeneratorCore",
             dependencies: [
+                .product(name: "OpenAPIKit", package: "OpenAPIKit"),
                 .product(name: "OpenAPIKit30", package: "OpenAPIKit"),
+                .product(name: "OpenAPIKitCompat", package: "OpenAPIKit"),
                 .product(name: "Algorithms", package: "swift-algorithms"),
                 .product(name: "Yams", package: "Yams"),
                 .product(name: "SwiftSyntax", package: "swift-syntax"),

Sources/_OpenAPIGeneratorCore/Diagnostics.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 import Foundation
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A message emitted by the generator.
 public struct Diagnostic: Error, Codable {

Sources/_OpenAPIGeneratorCore/Extensions/OpenAPIKit.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension Either {
 
@@ -20,7 +20,7 @@ extension Either {
     /// - Parameter components: The Components section of the OpenAPI document.
     func resolve(
         in components: OpenAPI.Components
-    ) throws -> B where A == JSONReference<B> {
+    ) throws -> B where A == OpenAPI.Reference<B> {
         switch self {
         case let .a(a):
             return try components.lookup(a)
@@ -59,6 +59,8 @@ extension JSONSchema.Schema {
             return "reference"
         case .fragment:
             return "fragment"
+        case .null:
+            return "null"
         }
     }
 
@@ -89,6 +91,8 @@ extension JSONSchema.Schema {
             return nil
         case .fragment(let coreContext):
             return coreContext.formatString
+        case .null:
+            return nil
         }
     }
 

Sources/_OpenAPIGeneratorCore/GeneratorPipeline.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 import Foundation
 import Yams
 

Sources/_OpenAPIGeneratorCore/Layers/ParsedOpenAPIRepresentation.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// An OpenAPIKit document that contains the operations and types for which the generator emits Swift types.
 typealias ParsedOpenAPIRepresentation = OpenAPI.Document

Sources/_OpenAPIGeneratorCore/Parser/YamsParser.swift

@@ -12,7 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 import Foundation
+import OpenAPIKit
 import OpenAPIKit30
+import OpenAPIKitCompat
 import Yams
 
 /// A parser that uses the Yams library to parse the provided
@@ -44,21 +46,27 @@ struct YamsParser: ParserProtocol {
         guard let openAPIVersion = versionedDocument.openapi else {
             throw Diagnostic.openAPIMissingVersionError(location: .init(filePath: input.absolutePath.path))
         }
-        switch openAPIVersion {
-        case "3.0.0", "3.0.1", "3.0.2", "3.0.3":
-            break
-        default:
-            throw Diagnostic.openAPIVersionError(
-                versionString: "openapi: \(openAPIVersion)",
-                location: .init(filePath: input.absolutePath.path)
-            )
-        }
-
         do {
-            return try decoder.decode(
-                OpenAPI.Document.self,
-                from: input.contents
-            )
+            let document: OpenAPIKit.OpenAPI.Document
+            switch openAPIVersion {
+            case "3.0.0", "3.0.1", "3.0.2", "3.0.3":
+                let openAPI30Document = try decoder.decode(
+                    OpenAPIKit30.OpenAPI.Document.self,
+                    from: input.contents
+                )
+                document = openAPI30Document.convert(to: .v3_1_0)
+            case "3.1.0":
+                document = try decoder.decode(
+                    OpenAPIKit.OpenAPI.Document.self,
+                    from: input.contents
+                )
+            default:
+                throw Diagnostic.openAPIVersionError(
+                    versionString: "openapi: \(openAPIVersion)",
+                    location: .init(filePath: input.absolutePath.path)
+                )
+            }
+            return document
         } catch DecodingError.dataCorrupted(let errorContext) {
             try checkParsingError(context: errorContext, input: input)
             throw DecodingError.dataCorrupted(errorContext)
@@ -104,7 +112,7 @@ extension Diagnostic {
     static func openAPIVersionError(versionString: String, location: Location) -> Diagnostic {
         return error(
             message:
-                "Unsupported document version: \(versionString). Please provide a document with OpenAPI versions in the 3.0.x set.",
+                "Unsupported document version: \(versionString). Please provide a document with OpenAPI versions in the 3.0.x or 3.1.x sets.",
             location: location
         )
     }
@@ -115,7 +123,7 @@ extension Diagnostic {
     static func openAPIMissingVersionError(location: Location) -> Diagnostic {
         return error(
             message:
-                "No openapi key found, please provide a valid OpenAPI document with OpenAPI versions in the 3.0.x set.",
+                "No openapi key found, please provide a valid OpenAPI document with OpenAPI versions in the 3.0.x or 3.1.x sets.",
             location: location
         )
     }

Sources/_OpenAPIGeneratorCore/Translator/ClientTranslator/ClientTranslator.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A translator for the generated client.
 ///

Sources/_OpenAPIGeneratorCore/Translator/ClientTranslator/translateClientMethod.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension ClientFileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateAllAnyOneOf.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// Describes one of the two options: allOf or anyOf.
 enum AllOrAnyOf {

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateArray.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateCodable.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateObjectStruct.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateRawRepresentableEnum.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateSchema.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 
@@ -38,7 +38,7 @@ extension FileTranslator {
             switch schema {
             case let .a(ref):
                 // reference, wrap that into JSONSchema
-                unwrappedSchema = .reference(ref)
+                unwrappedSchema = .reference(ref.jsonReference)
             case let .b(schema):
                 unwrappedSchema = schema
             }

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateStringEnum.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateStructBlueprint.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateTypealias.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTypes/CommentExtensions.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension Comment {
 

Sources/_OpenAPIGeneratorCore/Translator/CommonTypes/Constants.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// Constant values used in generated code, some of which refer to type names
 /// in the Runtime library, so they need to be kept in sync.

Sources/_OpenAPIGeneratorCore/Translator/CommonTypes/DiscriminatorExtensions.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 import Foundation
 
 /// A child schema of a oneOf with a discriminator.

Sources/_OpenAPIGeneratorCore/Translator/CommonTypes/SchemaOverrides.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A container of properties that can be defined at multiple levels in
 /// the OpenAPI document. If a property is filled in, the value is used instead

Sources/_OpenAPIGeneratorCore/Translator/CommonTypes/StructBlueprint.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A structure that contains the information about an OpenAPI object that is
 /// required to generate a matching Swift structure.

Sources/_OpenAPIGeneratorCore/Translator/Content/ContentInspector.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// Utilities for asking questions about OpenAPI.Content
 extension FileTranslator {

Sources/_OpenAPIGeneratorCore/Translator/Content/ContentSwiftName.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/Content/ContentType.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A content type of a request, response, and other types.
 ///

Sources/_OpenAPIGeneratorCore/Translator/Content/SchemaContent.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A type representing OpenAPI content that contains both a content type
 /// and the optional JSON schema.
@@ -48,4 +48,4 @@ struct TypedSchemaContent {
 /// An unresolved OpenAPI schema.
 ///
 /// Can be either a reference or an inline schema.
-typealias UnresolvedSchema = Either<JSONReference<JSONSchema>, JSONSchema>
+typealias UnresolvedSchema = Either<OpenAPI.Reference<JSONSchema>, JSONSchema>

Sources/_OpenAPIGeneratorCore/Translator/FileTranslator+FeatureFlags.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 extension FileTranslator {
 

Sources/_OpenAPIGeneratorCore/Translator/FileTranslator.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// An object that generates a Swift file for a provided OpenAPI document.
 ///

Sources/_OpenAPIGeneratorCore/Translator/MultiplexTranslator.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A translator that inspects the generator configuration and delegates
 /// the code generation logic to the appropriate translator.

Sources/_OpenAPIGeneratorCore/Translator/Operations/OperationDescription.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A wrapper of an OpenAPI operation that includes the information
 /// about the parent containers of the operation, such as its path

Sources/_OpenAPIGeneratorCore/Translator/Parameters/TypedParameter.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import OpenAPIKit30
+import OpenAPIKit
 
 /// A container for an OpenAPI parameter and its computed Swift type usage.
 struct TypedParameter {
@@ -258,7 +258,7 @@ extension FileTranslator {
 /// An unresolved OpenAPI parameter.
 ///
 /// Can be either a reference or an inline parameter.
-typealias UnresolvedParameter = Either<JSONReference<OpenAPI.Parameter>, OpenAPI.Parameter>
+typealias UnresolvedParameter = Either<OpenAPI.Reference<OpenAPI.Parameter>, OpenAPI.Parameter>
 
 extension OpenAPI.Parameter.Context.Location {