Passe validation rules as parameter to execute function instead of using protocol approach and use default ruleset all the time

Author: alexsteinerde

Sources/Graphiti/API/API.swift

@@ -6,20 +6,16 @@ public protocol API {
     associatedtype ContextType
     var resolver: Resolver { get }
     var schema: Schema<Resolver, ContextType> { get }
-    var validationRules: [(ValidationContext) -> Visitor] { get }
 }
 
 public extension API {
-    var validationRules: [(ValidationContext) -> Visitor] {
-        []
-    }
-    
     func execute(
         request: String,
         context: ContextType,
         on eventLoopGroup: EventLoopGroup,
         variables: [String: Map] = [:],
-        operationName: String? = nil
+        operationName: String? = nil,
+        validationRules: [(ValidationContext) -> Visitor] = []
     ) -> EventLoopFuture<GraphQLResult> {
         return schema.execute(
             request: request,
@@ -37,7 +33,8 @@ public extension API {
         context: ContextType,
         on eventLoopGroup: EventLoopGroup,
         variables: [String: Map] = [:],
-        operationName: String? = nil
+        operationName: String? = nil,
+        validationRules: [(ValidationContext) -> Visitor] = []
     ) -> EventLoopFuture<SubscriptionResult> {
         return schema.subscribe(
             request: request,
@@ -60,7 +57,8 @@ public extension API {
             context: ContextType,
             on eventLoopGroup: EventLoopGroup,
             variables: [String: Map] = [:],
-            operationName: String? = nil
+            operationName: String? = nil,
+            validationRules: [(ValidationContext) -> Visitor] = []
         ) async throws -> GraphQLResult {
             return try await schema.execute(
                 request: request,
@@ -79,7 +77,8 @@ public extension API {
             context: ContextType,
             on eventLoopGroup: EventLoopGroup,
             variables: [String: Map] = [:],
-            operationName: String? = nil
+            operationName: String? = nil,
+            validationRules: [(ValidationContext) -> Visitor] = []
         ) async throws -> SubscriptionResult {
             return try await schema.subscribe(
                 request: request,

Sources/Graphiti/Schema/Schema.swift

@@ -74,7 +74,7 @@ public extension Schema {
     ) -> EventLoopFuture<GraphQLResult> {
         do {
             return try graphql(
-                validationRules: validationRules,
+                validationRules: GraphQL.specifiedRules + validationRules,
                 schema: schema,
                 request: request,
                 rootValue: resolver,
@@ -99,7 +99,7 @@ public extension Schema {
     ) -> EventLoopFuture<SubscriptionResult> {
         do {
             return try graphqlSubscribe(
-                validationRules: validationRules,
+                validationRules: GraphQL.specifiedRules + validationRules,
                 schema: schema,
                 request: request,
                 rootValue: resolver,

Tests/GraphitiTests/ValidationRulesTests.swift

@@ -18,8 +18,7 @@ class ValidationRulesTests: XCTestCase {
         }
         let api = TestAPI<TestResolver, NoContext>(
             resolver: TestResolver(),
-            schema: testSchema,
-            validationRules: GraphQL.specifiedRules + [NoIntrospectionRule]
+            schema: testSchema
         )
 
         let group = MultiThreadedEventLoopGroup(numberOfThreads: System.coreCount)
@@ -36,7 +35,8 @@ class ValidationRulesTests: XCTestCase {
                 }
                 """,
                 context: NoContext(),
-                on: group
+                on: group,
+                validationRules: [NoIntrospectionRule]
             ).wait(),
             GraphQLResult(errors: [
                 .init(message: "GraphQL introspection is not allowed, but the query contained __schema or __type", locations: [.init(line: 2, column: 3)])
@@ -48,11 +48,9 @@ class ValidationRulesTests: XCTestCase {
 private class TestAPI<Resolver, ContextType>: API {
     public let resolver: Resolver
     public let schema: Schema<Resolver, ContextType>
-    var validationRules: [(ValidationContext) -> Visitor]
 
-    init(resolver: Resolver, schema: Schema<Resolver, ContextType>, validationRules: [(ValidationContext) -> Visitor]) {
+    init(resolver: Resolver, schema: Schema<Resolver, ContextType>) {
         self.resolver = resolver
         self.schema = schema
-        self.validationRules = validationRules
     }
 }