Remove Resolved* typealiases

Author: andrewelliott

Sources/_OpenAPIGeneratorCore/Translator/Operations/OperationDescription.swift

@@ -25,7 +25,7 @@ struct OperationDescription {
     var endpoint: OpenAPI.PathItem.Endpoint
 
     /// The path parameters at the operation level.
-    var pathParameters: ResolvedParameter.Array
+    var pathParameters: OpenAPI.Parameter.Array
 
     /// The OpenAPI components, used to resolve JSON references.
     var components: OpenAPI.Components
@@ -142,7 +142,7 @@ extension OperationDescription {
     /// Returns all parameters by resolving any parameter references first.
     ///
     /// - Throws: When an invalid JSON reference is found.
-    var allResolvedParameters: [ResolvedParameter] {
+    var allResolvedParameters: [OpenAPI.Parameter] {
         get throws {
             try allParameters.map { try $0.resolve(in: components) }
         }

Sources/_OpenAPIGeneratorCore/Translator/Parameters/TypedParameter.swift

@@ -17,7 +17,7 @@ import OpenAPIKit30
 struct TypedParameter {
 
     /// The OpenAPI parameter.
-    var parameter: ResolvedParameter
+    var parameter: OpenAPI.Parameter
 
     /// The underlying schema.
     var schema: UnresolvedSchema
@@ -54,7 +54,7 @@ extension TypedParameter {
     }
 
     /// The location of the parameter in the HTTP request.
-    var location: ResolvedParameter.Context.Location {
+    var location: OpenAPI.Parameter.Context.Location {
         parameter.location
     }
 
@@ -117,7 +117,7 @@ extension FileTranslator {
     ) throws -> TypedParameter? {
 
         // Collect the parameter
-        let parameter: ResolvedParameter
+        let parameter: OpenAPI.Parameter
         switch unresolvedParameter {
         case let .a(ref):
             parameter = try components.lookup(ref)
@@ -228,10 +228,7 @@ extension FileTranslator {
 /// Can be either a reference or an inline parameter.
 typealias UnresolvedParameter = Either<JSONReference<OpenAPI.Parameter>, OpenAPI.Parameter>
 
-/// A resolved OpenAPI parameter.
-typealias ResolvedParameter = OpenAPI.Parameter
-
-extension ResolvedParameter.Context.Location {
+extension OpenAPI.Parameter.Context.Location {
 
     /// A name of the location usable as a Swift type name.
     var shortTypeName: String {

Sources/_OpenAPIGeneratorCore/Translator/Parameters/translateParameter.swift

@@ -60,7 +60,7 @@ extension TypesFileTranslator {
         componentKey: OpenAPI.ComponentKey,
         parameter: TypedParameter
     ) throws -> [Declaration] {
-        let typeName = TypeAssigner.typeName(for: componentKey, of: ResolvedParameter.self)
+        let typeName = TypeAssigner.typeName(for: componentKey, of: OpenAPI.Parameter.self)
         return try translateParameterInTypes(
             typeName: typeName,
             parameter: parameter

Sources/_OpenAPIGeneratorCore/Translator/RequestBody/TypedRequestBody.swift

@@ -17,7 +17,7 @@ import OpenAPIKit30
 struct TypedRequestBody {
 
     /// The OpenAPI request body.
-    var request: ResolvedRequest
+    var request: OpenAPI.Request
 
     /// The computed type usage.
     var typeUsage: TypeUsage
@@ -84,7 +84,7 @@ extension FileTranslator {
         from unresolvedRequest: UnresolvedRequest
     ) throws -> TypedRequestBody? {
 
-        let request: ResolvedRequest
+        let request: OpenAPI.Request
         let isInlined: Bool
         switch unresolvedRequest {
         case .a(let reference):
@@ -118,6 +118,3 @@ extension FileTranslator {
 ///
 /// Can be either a reference or an inline request.
 typealias UnresolvedRequest = Either<JSONReference<OpenAPI.Request>, OpenAPI.Request>
-
-/// A resolved OpenAPI request.
-typealias ResolvedRequest = OpenAPI.Request

Sources/_OpenAPIGeneratorCore/Translator/Responses/ResponseKind.swift

@@ -45,7 +45,7 @@ enum ResponseKind {
         case _5XX
 
         /// Creates a new range that matches the specified OpenAPI range.
-        init(_ range: ResolvedResponse.StatusCode.Range) {
+        init(_ range: OpenAPI.Response.StatusCode.Range) {
             switch range {
             case .information:
                 self = ._1XX
@@ -191,7 +191,7 @@ extension ResponseKind: CustomStringConvertible {
     }
 }
 
-extension ResolvedResponse.StatusCode.Code {
+extension OpenAPI.Response.StatusCode.Code {
 
     /// Returns the matching OpenAPI response kind.
     var asKind: ResponseKind {

Sources/_OpenAPIGeneratorCore/Translator/Responses/TypedResponse.swift

@@ -17,7 +17,7 @@ import OpenAPIKit30
 struct TypedResponse {
 
     /// The OpenAPI response.
-    var response: ResolvedResponse
+    var response: OpenAPI.Response
 
     /// The computed type usage.
     var typeUsage: TypeUsage
@@ -39,7 +39,7 @@ extension FileTranslator {
     ) throws -> TypedResponse {
         let unresolvedResponse = outcome.response
         let typeName: TypeName
-        let response: ResolvedResponse
+        let response: OpenAPI.Response
         let isInlined: Bool
         switch unresolvedResponse {
         case .a(let reference):
@@ -64,6 +64,3 @@ extension FileTranslator {
 ///
 /// Can be either a reference or an inline response.
 typealias UnresolvedResponse = Either<JSONReference<OpenAPI.Response>, OpenAPI.Response>
-
-/// A resolved OpenAPI response.
-typealias ResolvedResponse = OpenAPI.Response

Sources/_OpenAPIGeneratorCore/Translator/Responses/TypedResponseHeader.swift

@@ -18,7 +18,7 @@ import OpenAPIKit30
 struct TypedResponseHeader {
 
     /// The OpenAPI response header.
-    var header: ResolvedHeader
+    var header: OpenAPI.Header
 
     /// The name of the header.
     var name: String
@@ -65,7 +65,7 @@ extension FileTranslator {
     /// headers are specified in the OpenAPI document, or if all headers are
     /// unsupported.
     func typedResponseHeaders(
-        from response: ResolvedResponse,
+        from response: OpenAPI.Response,
         inParent parent: TypeName
     ) throws -> [TypedResponseHeader] {
         guard let headers = response.headers else {
@@ -93,7 +93,7 @@ extension FileTranslator {
     ) throws -> TypedResponseHeader? {
 
         // Collect the header
-        let header: ResolvedHeader
+        let header: OpenAPI.Header
         switch unresolvedHeader {
         case let .a(ref):
             header = try components.lookup(ref)
@@ -169,6 +169,3 @@ extension FileTranslator {
 ///
 /// Can be either a reference or an inline response header.
 typealias UnresolvedHeader = Either<JSONReference<OpenAPI.Header>, OpenAPI.Header>
-
-/// A resolved OpenAPI response header.
-typealias ResolvedHeader = OpenAPI.Header

Sources/_OpenAPIGeneratorCore/Translator/Responses/translateResponse.swift

@@ -128,7 +128,7 @@ extension TypesFileTranslator {
     ) throws -> Declaration {
         let typeName = TypeAssigner.typeName(
             for: componentKey,
-            of: ResolvedResponse.self
+            of: OpenAPI.Response.self
         )
         return try translateResponseInTypes(
             typeName: typeName,

Sources/_OpenAPIGeneratorCore/Translator/Responses/translateResponseHeader.swift

@@ -47,7 +47,7 @@ extension TypesFileTranslator {
         componentKey: OpenAPI.ComponentKey,
         header: TypedResponseHeader
     ) throws -> [Declaration] {
-        let typeName = TypeAssigner.typeName(for: componentKey, of: ResolvedHeader.self)
+        let typeName = TypeAssigner.typeName(for: componentKey, of: OpenAPI.Header.self)
         return try translateResponseHeaderInTypes(
             typeName: typeName,
             header: header

Sources/_OpenAPIGeneratorCore/Translator/ServerTranslator/translateServerMethod.swift

@@ -24,7 +24,7 @@ extension ServerFileTranslator {
         let inputTypeName = operation.inputTypeName
 
         func locationSpecificInputDecl(
-            locatedIn location: ResolvedParameter.Context.Location,
+            locatedIn location: OpenAPI.Parameter.Context.Location,
             fromParameters parameters: [UnresolvedParameter]
         ) throws -> Declaration {
             let variableName = location.shortVariableName
@@ -75,7 +75,7 @@ extension ServerFileTranslator {
         inputMemberDecls.append(bodyDecl)
 
         func functionArgumentForLocation(
-            _ location: ResolvedParameter.Context.Location
+            _ location: OpenAPI.Parameter.Context.Location
         ) -> FunctionArgumentDescription {
             .init(
                 label: location.shortVariableName,

Sources/_OpenAPIGeneratorCore/Translator/TypeAssignment/TypeAssigner.swift

@@ -381,13 +381,13 @@ struct TypeAssigner {
     ///
     /// # Mapping
     /// - `#/components/schemas` -> `JSONSchema`
-    /// - `#/components/responses` -> `ResolvedResponse`
+    /// - `#/components/responses` -> `OpenAPI.Response`
     /// - `#/components/callbacks` -> `OpenAPI.Callbacks`
-    /// - `#/components/parameters` -> `ResolvedParameter`
+    /// - `#/components/parameters` -> `OpenAPI.Parameter`
     /// (includes request headers)
     /// - `#/components/examples` -> `OpenAPI.Example`
-    /// - `#/components/requestBodies` -> `ResolvedRequest`
-    /// - `#/components/headers` -> `ResolvedHeader` (response headers)
+    /// - `#/components/requestBodies` -> `OpenAPI.Request`
+    /// - `#/components/headers` -> `OpenAPI.Header` (response headers)
     /// - `#/components/securitySchemes` -> `OpenAPI.SecurityScheme`
     /// - `#/components/links` -> `OpenAPI.Link`
     ///
@@ -460,7 +460,7 @@ fileprivate extension TypeLocation {
         case .schemas:
             return TypeAssigner.typeName(for: JSONSchema.self)
         case .parameters:
-            return TypeAssigner.typeName(for: ResolvedParameter.self)
+            return TypeAssigner.typeName(for: OpenAPI.Parameter.self)
         }
     }
 }

Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateComponentHeaders.swift

@@ -20,15 +20,15 @@ extension TypesFileTranslator {
     /// - Parameter headers: The reusable response headers.
     /// - Returns: An enum declaration representing the headers namespace.
     func translateComponentHeaders(
-        _ headers: OpenAPI.ComponentDictionary<ResolvedHeader>
+        _ headers: OpenAPI.ComponentDictionary<OpenAPI.Header>
     ) throws -> Declaration {
 
         let typedHeaders: [(OpenAPI.ComponentKey, TypedResponseHeader)] =
             try headers
             .compactMap { key, header in
                 let parent = TypeAssigner.typeName(
                     for: key,
-                    of: ResolvedHeader.self
+                    of: OpenAPI.Header.self
                 )
                 guard
                     let value = try typedResponseHeader(
@@ -51,7 +51,7 @@ extension TypesFileTranslator {
             }
 
         let componentsParametersEnum = Declaration.commentable(
-            ResolvedHeader.sectionComment(),
+            OpenAPI.Header.sectionComment(),
             .enum(
                 accessModifier: config.access,
                 name: Constants.Components.Headers.namespace,

Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateComponentParameters.swift

@@ -20,15 +20,15 @@ extension TypesFileTranslator {
     /// - Parameter parameters: The reusable request parameters.
     /// - Returns: An enum declaration representing the parameters namespace.
     func translateComponentParameters(
-        _ parameters: OpenAPI.ComponentDictionary<ResolvedParameter>
+        _ parameters: OpenAPI.ComponentDictionary<OpenAPI.Parameter>
     ) throws -> Declaration {
 
         let typedParameters: [(OpenAPI.ComponentKey, TypedParameter)] =
             try parameters
             .compactMap { key, parameter in
                 let parent = TypeAssigner.typeName(
                     for: key,
-                    of: ResolvedParameter.self
+                    of: OpenAPI.Parameter.self
                 )
                 guard
                     let value = try parseAsTypedParameter(
@@ -50,7 +50,7 @@ extension TypesFileTranslator {
             }
 
         let componentsParametersEnum = Declaration.commentable(
-            ResolvedParameter.sectionComment(),
+            OpenAPI.Parameter.sectionComment(),
             .enum(
                 accessModifier: config.access,
                 name: Constants.Components.Parameters.namespace,

Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateComponentRequestBodies.swift

@@ -20,15 +20,15 @@ extension TypesFileTranslator {
     /// - Parameter requestBodies: The reusable request bodies.
     /// - Returns: An enum declaration representing the requestBodies namespace.
     func translateComponentRequestBodies(
-        _ items: OpenAPI.ComponentDictionary<ResolvedRequest>
+        _ items: OpenAPI.ComponentDictionary<OpenAPI.Request>
     ) throws -> Declaration {
 
         let typedItems: [TypedRequestBody] =
             try items
             .compactMap { key, item in
                 let typeName = TypeAssigner.typeName(
                     for: key,
-                    of: ResolvedRequest.self
+                    of: OpenAPI.Request.self
                 )
                 return try typedRequestBody(
                     typeName: typeName,
@@ -44,7 +44,7 @@ extension TypesFileTranslator {
             }
 
         let componentsEnum = Declaration.commentable(
-            ResolvedRequest.sectionComment(),
+            OpenAPI.Request.sectionComment(),
             .enum(
                 accessModifier: config.access,
                 name: Constants.Components.RequestBodies.namespace,

Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateComponentResponses.swift

@@ -20,15 +20,15 @@ extension TypesFileTranslator {
     /// - Parameter responses: The reusable responses.
     /// - Returns: An enum declaration representing the responses namespace.
     func translateComponentResponses(
-        _ responses: OpenAPI.ComponentDictionary<ResolvedResponse>
+        _ responses: OpenAPI.ComponentDictionary<OpenAPI.Response>
     ) throws -> Declaration {
 
         let typedResponses: [TypedResponse] =
             responses
             .map { key, response in
                 let typeName = TypeAssigner.typeName(
                     for: key,
-                    of: ResolvedResponse.self
+                    of: OpenAPI.Response.self
                 )
                 let value = TypedResponse(
                     response: response,
@@ -47,7 +47,7 @@ extension TypesFileTranslator {
             }
 
         let componentsResponsesEnum = Declaration.commentable(
-            ResolvedResponse.sectionComment(),
+            OpenAPI.Response.sectionComment(),
             .enum(
                 accessModifier: config.access,
                 name: Constants.Components.Responses.namespace,

Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateOperations.swift

@@ -25,7 +25,7 @@ extension TypesFileTranslator {
         let inputTypeName = description.inputTypeName
 
         func propertyBlueprintForNamespacedStruct(
-            locatedIn location: ResolvedParameter.Context.Location,
+            locatedIn location: OpenAPI.Parameter.Context.Location,
             withPropertiesFrom parameters: [UnresolvedParameter]
         ) throws -> PropertyBlueprint {
             let inputTypeName = description.inputTypeName

Tests/OpenAPIGeneratorCoreTests/Translator/TypeAssignment/Test_TypeAssigner.swift

@@ -26,30 +26,30 @@ class Test_TypeAssigner: Test_Core {
             )
         )
         try XCTAssertEqual(
-            TypeAssigner.typeName(for: JSONReference<ResolvedParameter>.component(named: "mumble")),
+            TypeAssigner.typeName(for: JSONReference<OpenAPI.Parameter>.component(named: "mumble")),
             newTypeName(
                 swiftFQName: "Components.Parameters.mumble",
                 jsonFQName: "#/components/parameters/mumble"
             )
         )
         try XCTAssertEqual(
-            TypeAssigner.typeName(for: JSONReference<ResolvedHeader>.component(named: "mumble")),
+            TypeAssigner.typeName(for: JSONReference<OpenAPI.Header>.component(named: "mumble")),
             newTypeName(
                 swiftFQName: "Components.Headers.mumble",
                 jsonFQName: "#/components/headers/mumble"
             )
 
         )
         try XCTAssertEqual(
-            TypeAssigner.typeName(for: JSONReference<ResolvedRequest>.component(named: "mumble")),
+            TypeAssigner.typeName(for: JSONReference<OpenAPI.Request>.component(named: "mumble")),
             newTypeName(
                 swiftFQName: "Components.RequestBodies.mumble",
                 jsonFQName: "#/components/requestBodies/mumble"
             )
 
         )
         try XCTAssertEqual(
-            TypeAssigner.typeName(for: JSONReference<ResolvedResponse>.component(named: "mumble")),
+            TypeAssigner.typeName(for: JSONReference<OpenAPI.Response>.component(named: "mumble")),
             newTypeName(
                 swiftFQName: "Components.Responses.mumble",
                 jsonFQName: "#/components/responses/mumble"