@@ -96,30 +96,36 @@ let showedError = false;
9696
9797const executeAppWithDI = appWithDI . createExecution ( ) ;
9898const executeApp = app . createExecution ( ) ;
99- const apolloWithDIExecutor = appWithDI . createApolloExecutor ( ) ;
99+ const apolloGWWithDI = appWithDI . createApolloGateway ( ) ;
100+ const apolloGWWithDILoadResult$ = apolloGWWithDI . load ( ) ;
100101const executeApolloWithDI = ( args : ExecutionArgs ) => {
101- return apolloWithDIExecutor ( {
102- schema : args . schema ,
103- document : args . document ,
104- operationName : args . operationName ,
105- context : args . contextValue ,
106- request : {
107- variables : args . variableValues ,
108- } ,
109- } ) ;
102+ return apolloGWWithDILoadResult$ . then ( ( { executor } ) =>
103+ executor ( {
104+ schema : args . schema ,
105+ document : args . document ,
106+ operationName : args . operationName ,
107+ context : args . contextValue ,
108+ request : {
109+ variables : args . variableValues ,
110+ } ,
111+ } )
112+ ) ;
110113} ;
111114
112- const apolloExecutor = app . createApolloExecutor ( ) ;
115+ const apolloGW = app . createApolloGateway ( ) ;
116+ const apolloGWLoadResult$ = apolloGW . load ( ) ;
113117const executeApollo = ( args : ExecutionArgs ) => {
114- return apolloExecutor ( {
115- schema : args . schema ,
116- document : args . document ,
117- operationName : args . operationName ,
118- context : args . contextValue ,
119- request : {
120- variables : args . variableValues ,
121- } ,
122- } ) ;
118+ return apolloGWLoadResult$ . then ( ( { executor } ) =>
119+ executor ( {
120+ schema : args . schema ,
121+ document : args . document ,
122+ operationName : args . operationName ,
123+ context : args . contextValue ,
124+ request : {
125+ variables : args . variableValues ,
126+ } ,
127+ } )
128+ ) ;
123129} ;
124130
125131const query = parse ( /* GraphQL */ `
@@ -162,11 +168,11 @@ const suites: Record<string, { name: string; runner: Function }> = {
162168 } ,
163169 'apollo-with-id' : {
164170 name : 'ApolloServer (DI)' ,
165- runner : ( ) => graphql ( appWithDI . schema , executeApolloWithDI as any ) ,
171+ runner : ( ) => graphql ( appWithDI . schema , executeApolloWithDI ) ,
166172 } ,
167173 apollo : {
168174 name : 'ApolloServer' ,
169- runner : ( ) => graphql ( app . schema , executeApollo as any ) ,
175+ runner : ( ) => graphql ( app . schema , executeApollo ) ,
170176 } ,
171177} ;
172178
0 commit comments