feat: Deprecates specifying execution strategies

Author: NeedleInAJayStack

Sources/GraphQL/GraphQL.swift

@@ -86,6 +86,33 @@ public typealias SubscriptionEventStream = EventStream<Future<GraphQLResult>>
 /// an error occurs only in a specific field. If that happens the value of that field will be `null`
 /// and there will be an error inside `errors` specifying the reason for the failure and the path of
 /// the failed field.
+public func graphql(
+    schema: GraphQLSchema,
+    request: String,
+    rootValue: Any = (),
+    context: Any = (),
+    eventLoopGroup: EventLoopGroup,
+    variableValues: [String: Map] = [:],
+    operationName: String? = nil,
+    validationRules: [(ValidationContext) -> Visitor] = []
+) throws -> Future<GraphQLResult> {
+    return try graphql(
+        queryStrategy: ConcurrentFieldExecutionStrategy(),
+        mutationStrategy: SerialFieldExecutionStrategy(),
+        subscriptionStrategy: ConcurrentFieldExecutionStrategy(),
+        instrumentation: NoOpInstrumentation,
+        validationRules: validationRules,
+        schema: schema,
+        request: request,
+        rootValue: rootValue,
+        context: context,
+        eventLoopGroup: eventLoopGroup,
+        variableValues: variableValues,
+        operationName: operationName
+    )
+}
+
+@available(*, deprecated, message: "Specifying exeuction strategies and instrumentation will be removed in a future version.")
 public func graphql(
     queryStrategy: QueryFieldExecutionStrategy = ConcurrentFieldExecutionStrategy(),
     mutationStrategy: MutationFieldExecutionStrategy = SerialFieldExecutionStrategy(),
@@ -155,6 +182,31 @@ public func graphql(
 /// an error occurs only in a specific field. If that happens the value of that field will be `null`
 /// and there will be an error inside `errors` specifying the reason for the failure and the path of
 /// the failed field.
+public func graphql<Retrieval: PersistedQueryRetrieval>(
+    queryRetrieval: Retrieval,
+    queryId: Retrieval.Id,
+    rootValue: Any = (),
+    context: Any = (),
+    eventLoopGroup: EventLoopGroup,
+    variableValues: [String: Map] = [:],
+    operationName: String? = nil
+) throws -> Future<GraphQLResult> {
+    return try graphql(
+        queryStrategy: ConcurrentFieldExecutionStrategy(),
+        mutationStrategy: SerialFieldExecutionStrategy(),
+        subscriptionStrategy: ConcurrentFieldExecutionStrategy(),
+        instrumentation: NoOpInstrumentation,
+        queryRetrieval: queryRetrieval,
+        queryId: queryId,
+        rootValue: rootValue,
+        context: context,
+        eventLoopGroup: eventLoopGroup,
+        variableValues: variableValues,
+        operationName: operationName
+    )
+}
+
+@available(*, deprecated, message: "Specifying exeuction strategies and instrumentation will be removed in a future version.")
 public func graphql<Retrieval: PersistedQueryRetrieval>(
     queryStrategy: QueryFieldExecutionStrategy = ConcurrentFieldExecutionStrategy(),
     mutationStrategy: MutationFieldExecutionStrategy = SerialFieldExecutionStrategy(),
@@ -229,6 +281,32 @@ public func graphql<Retrieval: PersistedQueryRetrieval>(
 /// that happens the value of that field will be `null` and there
 /// will be an error inside `errors` specifying the reason for the failure and the path of the
 /// failed field.
+public func graphqlSubscribe(
+    schema: GraphQLSchema,
+    request: String,
+    rootValue: Any = (),
+    context: Any = (),
+    eventLoopGroup: EventLoopGroup,
+    variableValues: [String: Map] = [:],
+    operationName: String? = nil,
+    validationRules: [(ValidationContext) -> Visitor] = []
+) throws -> Future<SubscriptionResult> {
+    return try graphqlSubscribe(
+        queryStrategy: ConcurrentFieldExecutionStrategy(),
+        mutationStrategy: SerialFieldExecutionStrategy(),
+        subscriptionStrategy: ConcurrentFieldExecutionStrategy(),
+        instrumentation: NoOpInstrumentation,
+        schema: schema,
+        request: request,
+        rootValue: rootValue,
+        context: context,
+        eventLoopGroup: eventLoopGroup,
+        variableValues: variableValues,
+        operationName: operationName
+    )
+}
+
+@available(*, deprecated, message: "Specifying exeuction strategies and instrumentation will be removed in a future version.")
 public func graphqlSubscribe(
     queryStrategy: QueryFieldExecutionStrategy = ConcurrentFieldExecutionStrategy(),
     mutationStrategy: MutationFieldExecutionStrategy = SerialFieldExecutionStrategy(),
@@ -310,6 +388,28 @@ public func graphqlSubscribe(
 /// field will be `null` and there will be an error inside `errors` specifying the reason for
 /// the failure and the path of the failed field.
 @available(macOS 10.15, iOS 15, watchOS 8, tvOS 15, *)
+public func graphql(
+    schema: GraphQLSchema,
+    request: String,
+    rootValue: Any = (),
+    context: Any = (),
+    eventLoopGroup: EventLoopGroup,
+    variableValues: [String: Map] = [:],
+    operationName: String? = nil
+) async throws -> GraphQLResult {
+    return try await graphql(
+        schema: schema,
+        request: request,
+        rootValue: rootValue,
+        context: context,
+        eventLoopGroup: eventLoopGroup,
+        variableValues: variableValues,
+        operationName: operationName
+    ).get()
+}
+
+@available(macOS 10.15, iOS 15, watchOS 8, tvOS 15, *)
+@available(*, deprecated, message: "Specifying exeuction strategies and instrumentation will be removed in a future version.")
 public func graphql(
     queryStrategy: QueryFieldExecutionStrategy = ConcurrentFieldExecutionStrategy(),
     mutationStrategy: MutationFieldExecutionStrategy = SerialFieldExecutionStrategy(),
@@ -377,6 +477,28 @@ public func graphql(
 /// will be an error inside `errors` specifying the reason for the failure and the path of the
 /// failed field.
 @available(macOS 10.15, iOS 15, watchOS 8, tvOS 15, *)
+public func graphqlSubscribe(
+    schema: GraphQLSchema,
+    request: String,
+    rootValue: Any = (),
+    context: Any = (),
+    eventLoopGroup: EventLoopGroup,
+    variableValues: [String: Map] = [:],
+    operationName: String? = nil
+) async throws -> SubscriptionResult {
+    return try await graphqlSubscribe(
+        schema: schema,
+        request: request,
+        rootValue: rootValue,
+        context: context,
+        eventLoopGroup: eventLoopGroup,
+        variableValues: variableValues,
+        operationName: operationName
+    ).get()
+}
+
+@available(macOS 10.15, iOS 15, watchOS 8, tvOS 15, *)
+@available(*, deprecated, message: "Specifying exeuction strategies and instrumentation will be removed in a future version.")
 public func graphqlSubscribe(
     queryStrategy: QueryFieldExecutionStrategy = ConcurrentFieldExecutionStrategy(),
     mutationStrategy: MutationFieldExecutionStrategy = SerialFieldExecutionStrategy(),

Tests/GraphQLTests/SubscriptionTests/SubscriptionSchema.swift

@@ -193,10 +193,6 @@ func createSubscription(
     variableValues: [String: Map] = [:]
 ) throws -> SubscriptionEventStream {
     let result = try graphqlSubscribe(
-        queryStrategy: SerialFieldExecutionStrategy(),
-        mutationStrategy: SerialFieldExecutionStrategy(),
-        subscriptionStrategy: SerialFieldExecutionStrategy(),
-        instrumentation: NoOpInstrumentation,
         schema: schema,
         request: query,
         rootValue: (),