update to OpenAPIKit v1.0

Author: mattpolzin

Package.resolved

@@ -16,10 +16,10 @@ let package = Package(
             targets: ["JSONAPIVizGen"])
     ],
     dependencies: [
-        .package(url: "https://github.com/mattpolzin/Sampleable", .upToNextMajor(from: "2.0.0")),
+        .package(url: "https://github.com/mattpolzin/Sampleable", from: "2.0.0"),
         .package(url: "https://github.com/mattpolzin/JSONAPI", from: "4.0.0-alpha.2"),
-        .package(url: "https://github.com/mattpolzin/OpenAPIKit", .upToNextMinor(from: "0.30.0")),
-        .package(url: "https://github.com/mattpolzin/OpenAPIReflection", .upToNextMinor(from: "0.2.0")),
+        .package(url: "https://github.com/mattpolzin/OpenAPIKit", from: "1.0.0"),
+        .package(url: "https://github.com/mattpolzin/OpenAPIReflection", .upToNextMinor(from: "0.3.0")),
         .package(url: "https://github.com/typelift/SwiftCheck", .upToNextMinor(from: "0.12.0")),
         .package(url: "https://github.com/jpsim/SourceKitten", .upToNextMinor(from: "0.26.0")),
         .package(name: "NonEmpty", url: "https://github.com/pointfreeco/swift-nonempty", .upToNextMinor(from: "0.2.0")),

Package.swift

@@ -13,7 +13,7 @@ public struct ResourceObjectSwiftGenCollection {
     public init(_ doc: OpenAPI.Document, testSuiteConfiguration: TestSuiteConfiguration) throws {
         let pathItems = doc.paths
 
-        resourceObjectGenerators = OpenAPI.HttpVerb.allCases
+        resourceObjectGenerators = OpenAPI.HttpMethod.allCases
             .flatMap { httpVerb in
                 return pathItems.flatMap { (path, pathItem) -> [ResourceObjectSwiftGen] in
                     guard let operation = pathItem.for(httpVerb) else {
@@ -42,10 +42,10 @@ public struct ResourceObjectSwiftGenCollection {
 
 func documents(
     from responses: OpenAPI.Response.Map,
-    for httpVerb: OpenAPI.HttpVerb,
+    for httpVerb: OpenAPI.HttpMethod,
     at path: OpenAPI.Path,
     on server: OpenAPI.Server,
-    given params: [OpenAPI.PathItem.Parameter],
+    given params: [OpenAPI.Parameter],
     testSuiteConfiguration: TestSuiteConfiguration
 ) -> [OpenAPI.Response.StatusCode: DataDocumentSwiftGen] {
     var responseDocuments = [OpenAPI.Response.StatusCode: DataDocumentSwiftGen]()

Sources/JSONAPISwiftGen/ResourceObjectSwiftGenCollection.swift

@@ -167,7 +167,7 @@ public struct DataDocumentSwiftGen: JSONSchemaSwiftGenerator {
             // a `oneOf` with resource types within it.
             let resources: [ResourceObjectSwiftGen]
             switch items {
-            case .one(of: let resourceTypeSchemas):
+            case .one(of: let resourceTypeSchemas, _):
                 resources = try Array(Set(resourceTypeSchemas.map {
                     try ResourceObjectSwiftGen(structure: $0,
                                                allowPlaceholders: allowPlaceholders)

Sources/JSONAPISwiftGen/Swift Generators/DocumentSwiftGen.swift

@@ -24,7 +24,7 @@ public struct APIRequestTestSwiftGen: SwiftGenerator {
 
     public init(server: OpenAPI.Server,
                 pathComponents: OpenAPI.Path,
-                parameters: [OpenAPI.PathItem.Parameter]) throws {
+                parameters: [OpenAPI.Parameter]) throws {
 
         let parameterArgs = try parameters
             .filter { !$0.context.inQuery } // for now these are handled as a block rather than each as separate args
@@ -139,23 +139,23 @@ public struct APIRequestTestSwiftGen: SwiftGenerator {
                             .init(value: "URL(string: \"\(hostUrl.absoluteString)/\(pathString)\")!"))
     }
 
-    private static func parameterSnippet(from parameter: OpenAPI.PathItem.Parameter) throws -> Decl {
+    private static func parameterSnippet(from parameter: OpenAPI.Parameter) throws -> Decl {
         let (parameterName, parameterType) = try argument(for: parameter)
 
         return PropDecl.let(propName: parameterName,
                             swiftType: parameterType,
                             .placeholder(name: parameter.name, type: parameterType))
     }
 
-    static func argument(for parameter: OpenAPI.PathItem.Parameter) throws -> (name: String, type: SwiftTypeRep) {
+    static func argument(for parameter: OpenAPI.Parameter) throws -> (name: String, type: SwiftTypeRep) {
         let parameterName = propertyCased(parameter.name)
         let isParamRequired = parameter.required
         let parameterType = try type(from: parameter.schemaOrContent)
 
         return (name: parameterName, type: isParamRequired ? parameterType : parameterType.optional)
     }
 
-    private static func type(from parameterSchemaOrContent: Either<OpenAPI.PathItem.Parameter.Schema, OpenAPI.Content.Map>) throws -> SwiftTypeRep {
+    private static func type(from parameterSchemaOrContent: Either<OpenAPI.Parameter.SchemaContext, OpenAPI.Content.Map>) throws -> SwiftTypeRep {
         switch parameterSchemaOrContent {
         case .a(let paramSchema):
             guard let schema = paramSchema.schema.b else {

Sources/JSONAPISwiftGen/Swift Generators/Test Generators/APIRequestTestSwiftGen.swift

@@ -8,7 +8,7 @@
 import Foundation
 import OpenAPIKit
 
-public extension OpenAPI.PathItem.Parameter {
+public extension OpenAPI.Parameter {
     /// Map from a Parameter's name to that Parameter's string-encoded value
     typealias ValueMap = [String: String]
 }
@@ -29,7 +29,7 @@ public struct OpenAPIExampleRequestTestSwiftGen: SwiftFunctionGenerator {
     public init(
         server: OpenAPI.Server,
         pathComponents: OpenAPI.Path,
-        parameters: [OpenAPI.PathItem.Parameter],
+        parameters: [OpenAPI.Parameter],
         testSuiteConfiguration: TestSuiteConfiguration,
         testProperties: TestProperties,
         exampleResponseDataPropName: String?,
@@ -147,8 +147,8 @@ public struct OpenAPIExampleRequestTestSwiftGen: SwiftFunctionGenerator {
     }
 
     static func headersSnippet(
-        from parameters: [OpenAPI.PathItem.Parameter],
-        values: OpenAPI.PathItem.Parameter.ValueMap,
+        from parameters: [OpenAPI.Parameter],
+        values: OpenAPI.Parameter.ValueMap,
         inTest testName: String,
         reportingMissingParameters: Bool
     ) throws -> Decl {

Sources/JSONAPISwiftGen/Swift Generators/Test Generators/OpenAPIExampleRequestTestSwiftGen.swift

@@ -14,8 +14,8 @@ extension OpenAPIExampleRequestTestSwiftGen {
         public let name: String
         public let host: URL
         public let skipExample: Bool
-        public let parameters: OpenAPI.PathItem.Parameter.ValueMap
-        public let queryParameters: OpenAPI.PathItem.Parameter.ValueMap
+        public let parameters: OpenAPI.Parameter.ValueMap
+        public let queryParameters: OpenAPI.Parameter.ValueMap
         public let ignoreMissingParameterWarnings: Bool
 
         /// Create properties for an API Test
@@ -40,7 +40,7 @@ extension OpenAPIExampleRequestTestSwiftGen {
                 .flatMap { $0 as? Bool }
                 ?? false
 
-            guard let testParams = testProps["parameters"] as? OpenAPI.PathItem.Parameter.ValueMap else {
+            guard let testParams = testProps["parameters"] as? OpenAPI.Parameter.ValueMap else {
                 throw Error.invalidTestParameters(inTest: name)
             }
             parameters = testParams

Sources/JSONAPISwiftGen/Swift Generators/Test Generators/RequestTestProperties.swift

@@ -35,7 +35,7 @@ import OpenAPIKit
 public struct TestFunctionName: Equatable, RawRepresentable {
 
     public let path: OpenAPI.Path
-    public let endpoint: OpenAPI.HttpVerb
+    public let endpoint: OpenAPI.HttpMethod
     public let direction: HttpDirection
     public let testName: String
 
@@ -102,7 +102,7 @@ public struct TestFunctionName: Equatable, RawRepresentable {
 
         self.direction = direction
 
-        guard let endpoint = OpenAPI.HttpVerb(rawValue: String(components.removeLast())) else {
+        guard let endpoint = OpenAPI.HttpMethod(rawValue: String(components.removeLast())) else {
             return nil
         }
 
@@ -113,7 +113,7 @@ public struct TestFunctionName: Equatable, RawRepresentable {
 
     public init(
         path: OpenAPI.Path,
-        endpoint: OpenAPI.HttpVerb,
+        endpoint: OpenAPI.HttpMethod,
         direction: HttpDirection,
         testName: String
     ) {

Sources/JSONAPISwiftGen/Swift Generators/Test Generators/TestFunctionName.swift

@@ -265,7 +265,7 @@ class JSONAPIDocumentOpenAPITests: XCTestCase {
 		XCTAssertTrue(arrayContext.uniqueItems)
 		XCTAssertEqual(arrayContext.minItems, 0)
 
-		guard case let .one(of: includeNodes)? = arrayContext.items else {
+		guard case let .one(of: includeNodes, _)? = arrayContext.items else {
 			XCTFail("Expected Included to contain multiple types of items.")
 			return
 		}