Added additional required properties to OpenAPI parameter type.

Author: mattpolzin

Sources/JSONAPIOpenAPI/OpenAPI/OpenAPITypes+Codable.swift

@@ -321,6 +321,65 @@ extension OpenAPIPathItem.PathProperties.Operation: Encodable {
 	}
 }
 
+extension OpenAPIPathItem.PathProperties.Parameter: Encodable {
+	private enum CodingKeys: String, CodingKey {
+		case name
+		case parameterLocation = "in"
+		case description
+		case required
+		case deprecated
+
+		// the following are alternatives
+		case content
+		case schema
+	}
+
+	public func encode(to encoder: Encoder) throws {
+		var container = encoder.container(keyedBy: CodingKeys.self)
+
+		try container.encode(name, forKey: .name)
+
+		let required: Bool?
+		let location: String
+		switch parameterLocation {
+		case .query(required: let req):
+			required = req
+			location = "query"
+		case .header(required: let req):
+			required = req
+			location = "header"
+		case .path:
+			required = true
+			location = "path"
+		case .cookie(required: let req):
+			required = req
+			location = "cookie"
+		}
+		try container.encode(location, forKey: .parameterLocation)
+
+		try container.encode(required, forKey: .required)
+
+		switch schemaOrContent {
+		case .a(let schema):
+			try container.encode(schema, forKey: .schema)
+		case .b(let contentMap):
+			// Hack to work around Dictionary encoding
+			// itself as an array in this case:
+			let stringKeyedDict = Dictionary(
+				contentMap.map { ($0.key.rawValue, $0.value) },
+				uniquingKeysWith: { $1 }
+			)
+			try container.encode(stringKeyedDict, forKey: .content)
+		}
+
+		if description != nil {
+			try container.encode(description, forKey: .description)
+		}
+
+		try container.encode(deprecated, forKey: .deprecated)
+	}
+}
+
 extension OpenAPIPathItem.PathProperties: Encodable {
 	private enum CodingKeys: String, CodingKey {
 		case summary

Sources/JSONAPIOpenAPI/OpenAPI/OpenAPITypes.swift

@@ -720,37 +720,37 @@ public enum OpenAPIPathItem: Equatable {
 
 		public typealias ParameterArray = [Either<Parameter, JSONReference<OpenAPIComponents, Parameter>>]
 
-		public struct Parameter: Equatable, Encodable {
-			private enum CodingKeys: String, CodingKey {
-				case name
-//				case parameterLocation = "in"
-				case description
-				case deprecated
-			}
-
+		public struct Parameter: Equatable {
 			public let name: String
-//			public let parameterLocation: Location
+			public let parameterLocation: Location
 			public let description: String?
 			public let deprecated: Bool // default is false
+			public let schemaOrContent: Either<SchemaProperty, Operation.ContentMap>
 			// TODO: serialization rules
 			/*
 			Serialization Rules
 			*/
 
+			public typealias SchemaProperty = Either<JSONNode, JSONReference<OpenAPIComponents, JSONNode>>
+
 			public init(name: String,
+						parameterLocation: Location,
+						schemaOrContent: Either<SchemaProperty, Operation.ContentMap>,
 						description: String? = nil,
 						deprecated: Bool = false) {
 				self.name = name
+				self.parameterLocation = parameterLocation
+				self.schemaOrContent = schemaOrContent
 				self.description = description
 				self.deprecated = deprecated
 			}
 
-//			public enum Location: Encodable {
-//				case query(required: Bool?)
-//				case header(required: Bool?)
-//				case path
-//				case cookie(required: Bool?)
-//			}
+			public enum Location: Equatable {
+				case query(required: Bool?)
+				case header(required: Bool?)
+				case path
+				case cookie(required: Bool?)
+			}
 		}
 
 		public struct Operation: Equatable {