Skip to content

Commit

Permalink
Merge pull request #385 from theoriginalbit/fix-typo-in-validator-names
Browse files Browse the repository at this point in the history
  • Loading branch information
mattpolzin authored Oct 8, 2024
2 parents 35dd374 + 5d3ea0f commit cf31c5d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 10 deletions.
34 changes: 27 additions & 7 deletions Sources/OpenAPIKit/Validator/Validation+Builtins.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extension Validation {
/// Validate the OpenAPI Document has at least one path in its
/// `PathItem.Map`.
///
/// The OpenAPI Specifcation does not require that the document
/// The OpenAPI Specification does not require that the document
/// contain any paths for [security reasons](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#security-filtering)
/// or even because it only contains webhooks, but authors may still
/// want to protect against an empty `PathItem.Map` in some cases.
Expand All @@ -29,7 +29,7 @@ extension Validation {
/// Validate the OpenAPI Document's `PathItems` all have at least
/// one operation.
///
/// The OpenAPI Specifcation does not require that path items
/// The OpenAPI Specification does not require that path items
/// contain any operations for [security reasons](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#security-filtering)
/// but documentation that is public in nature might only ever have
/// a `PathItem` with no operations in error.
Expand All @@ -45,7 +45,7 @@ extension Validation {
/// Validate the OpenAPI Document's `JSONSchemas` all have at least
/// one defining characteristic.
///
/// The JSON Schema Specifcation does not require that components
/// The JSON Schema Specification does not require that components
/// have any defining characteristics. An "empty" schema component can
/// be written as follows:
///
Expand Down Expand Up @@ -160,7 +160,7 @@ extension Validation {
/// Validate the OpenAPI Document's `Operations` all have at least
/// one response.
///
/// The OpenAPI Specifcation does not require that Responses Objects
/// The OpenAPI Specification does not require that Responses Objects
/// contain at least one response but you may wish to validate that all
/// operations contain at least one response in your own API.
///
Expand All @@ -182,7 +182,7 @@ extension Validation {

/// Validate that the OpenAPI Document's `Tags` all have unique names.
///
/// The OpenAPI Specifcation requires that tag names on the Document
/// The OpenAPI Specification requires that tag names on the Document
/// [are unique](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#openapi-object).
///
/// - Important: This is included in validation by default.
Expand Down Expand Up @@ -435,7 +435,7 @@ extension Validation {
///
/// - Important: This is included in validation by default.
///
public static var serverVarialbeEnumIsValid: Validation<OpenAPI.Server.Variable> {
public static var serverVariableEnumIsValid: Validation<OpenAPI.Server.Variable> {
.init(
description: "Server Variable's enum is either not defined or is non-empty (if defined).",
check: { context in
Expand All @@ -445,12 +445,22 @@ extension Validation {
)
}

/// Validate that `enum` must not be empty in the document's
/// Server Variable.
///
/// - Important: This is included in validation by default.
///
@available(*, deprecated, renamed: "serverVariableEnumIsValid")
public static var serverVarialbeEnumIsValid: Validation<OpenAPI.Server.Variable> {
return serverVariableEnumIsValid
}

/// Validate that `default` must exist in the enum values in the document's
/// Server Variable, if such values (enum) are defined.
///
/// - Important: This is included in validation by default.
///
public static var serverVarialbeDefaultExistsInEnum : Validation<OpenAPI.Server.Variable> {
public static var serverVariableDefaultExistsInEnum : Validation<OpenAPI.Server.Variable> {
.init(
description: "Server Variable's default must exist in enum, if enum is defined.",
check: { context in
Expand All @@ -459,6 +469,16 @@ extension Validation {
}
)
}

/// Validate that `default` must exist in the enum values in the document's
/// Server Variable, if such values (enum) are defined.
///
/// - Important: This is included in validation by default.
///
@available(*, deprecated, renamed: "serverVariableDefaultExistsInEnum")
public static var serverVarialbeDefaultExistsInEnum : Validation<OpenAPI.Server.Variable> {
return serverVariableDefaultExistsInEnum
}
}

/// Used by both the Path Item parameter check and the
Expand Down
6 changes: 3 additions & 3 deletions Sources/OpenAPIKit/Validator/Validator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ extension OpenAPI.Document {
/// `where` clause both examine the same type (i.e. `OpenAPI.Document.Info`
/// from the previous example and `OpenAPI.Document` from the next example).
///
/// The next example also uses `take()` in its `where` caluse. This allows you to
/// The next example also uses `take()` in its `where` clause. This allows you to
/// dig into a value based on its KeyPath just like the previous example but you can
/// use it for more complicated criteria than equality/inequality.
///
Expand Down Expand Up @@ -191,8 +191,8 @@ public final class Validator {
.init(.headerReferencesAreValid),
.init(.linkReferencesAreValid),
.init(.pathItemReferencesAreValid),
.init(.serverVarialbeEnumIsValid),
.init(.serverVarialbeDefaultExistsInEnum)
.init(.serverVariableEnumIsValid),
.init(.serverVariableDefaultExistsInEnum)
])
}

Expand Down

0 comments on commit cf31c5d

Please sign in to comment.