@@ -36,7 +36,7 @@ import { Subschema } from './Subschema.js';
3636import { createRequest , getDelegatingOperation } from './createRequest.js' ;
3737import { Transformer } from './Transformer.js' ;
3838import { applySchemaTransforms } from './applySchemaTransforms.js' ;
39- import { ExecutionArgs , execute , subscribe } from '@graphql-tools/executor' ;
39+ import { normalizedExecutor } from '@graphql-tools/executor' ;
4040
4141export function delegateToSchema <
4242 TContext extends Record < string , any > = Record < string , any > ,
@@ -219,18 +219,13 @@ function getExecutor<TContext extends Record<string, any>>(
219219
220220export const createDefaultExecutor = memoize1 ( function createDefaultExecutor ( schema : GraphQLSchema ) : Executor {
221221 return function defaultExecutor ( request : ExecutionRequest ) {
222- const executionArgs : ExecutionArgs = {
222+ return normalizedExecutor ( {
223223 schema,
224224 document : request . document ,
225225 rootValue : request . rootValue ,
226226 contextValue : request . context ,
227227 variableValues : request . variables ,
228228 operationName : request . operationName ,
229- } ;
230- const operationType = request . operationType || getOperationASTFromRequest ( request ) . operation ;
231- if ( operationType === 'subscription' ) {
232- return subscribe ( executionArgs ) ;
233- }
234- return execute ( executionArgs ) ;
229+ } ) ;
235230 } ;
236231} ) ;
0 commit comments