retire BuildExecutionContextArgs

in favor of union of ExecutionArgs & SubscriptionArgs
graphql · Jun 21, 2021 · bcf5a72 · bcf5a72
1 parent cffc71e
commit bcf5a72
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/execution/executor.ts b/src/execution/executor.ts
@@ -59,14 +59,11 @@ import type {
   ExecutionContext,
   ExecutionResult,
 } from './execute';
+import type { SubscriptionArgs } from './subscribe';
 import { getVariableValues, getArgumentValues } from './values';
 import { collectFields } from './collectFields';
 import { mapAsyncIterator } from './mapAsyncIterator';
 
-export interface BuildExecutionContextArgs extends ExecutionArgs {
-  subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
-}
-
 /**
  * This class is exported only to assist people in implementing their own executors
  * without duplicating too much code and should be used only as last resort for cases
@@ -101,7 +98,9 @@ export class Executor {
   protected _errors: Array<GraphQLError>;
 
   constructor(
-    argsOrExecutionContext: BuildExecutionContextArgs | ExecutionContext,
+    argsOrExecutionContext:
+      | (ExecutionArgs & SubscriptionArgs)
+      | ExecutionContext,
   ) {
     const executionContext =
       'fragments' in argsOrExecutionContext
@@ -142,7 +141,7 @@ export class Executor {
    * @internal
    */
   static buildExecutionContext(
-    args: BuildExecutionContextArgs,
+    args: ExecutionArgs & SubscriptionArgs,
   ): ExecutionContext {
     const {
       schema,