Move to {gateway: createGateway} API

apollographql · Jun 25, 2019 · 3c9bdc5 · 3c9bdc5
1 parent 6df6f00
commit 3c9bdc5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts
@@ -1,7 +1,7 @@
 import {
-  GraphQLExecutor,
   GraphQLExecutionResult,
   GraphQLRequestContext,
+  GraphQLService,
 } from 'apollo-server-core';
 import { InMemoryLRUCache } from 'apollo-server-caching';
 import { isObjectType, isIntrospectionType, GraphQLSchema } from 'graphql';
@@ -24,12 +24,6 @@ import { serializeQueryPlan, QueryPlan } from './QueryPlan';
 import { GraphQLDataSource } from './datasources/types';
 import { RemoteGraphQLDataSource } from './datasources/RemoteGraphQLDatasource';
 
-export interface GraphQLService {
-  schema?: GraphQLSchema;
-  executor: GraphQLExecutor;
-  isReady: boolean;
-}
-
 export type ServiceEndpointDefinition = Pick<ServiceDefinition, 'name' | 'url'>;
 
 export interface GatewayConfigBase {
@@ -52,7 +46,7 @@ function isLocalConfig(config: GatewayConfig): config is LocalGatewayConfig {
   return 'localServiceList' in config;
 }
 
-export class ApolloGateway implements GraphQLService {
+export class ApolloGateway {
   public schema?: GraphQLSchema;
   public isReady: boolean = false;
   protected serviceMap: ServiceMap = Object.create(null);
@@ -95,7 +89,7 @@ export class ApolloGateway implements GraphQLService {
       this.createSchema(services);
     }
 
-    return { schema: this.schema, executor: this.executor };
+    return { schema: this.schema!, executor: this.executor };
   }
 
   protected createSchema(services: ServiceDefinition[]) {
@@ -264,8 +258,7 @@ export async function createGateway(
   config: GatewayConfig,
 ): Promise<GraphQLService> {
   const gateway = new ApolloGateway(config);
-  await gateway.load();
-  return gateway;
+  return await gateway.load();
 }
 
 export {

diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts
@@ -153,6 +153,7 @@ export class ApolloServerBase {
       uploads,
       playground,
       plugins,
+      gateway,
       ...requestOptions
     } = config;
 
@@ -261,6 +262,9 @@ export class ApolloServerBase {
         throw new Error(errors.map(error => error.message).join('\n\n'));
       }
       this.schema = schema!;
+    } else if (gateway) {
+      this.schema = gateway.schema;
+      this.requestOptions.executor = gateway.executor;
     } else {
       if (!typeDefs) {
         throw Error(

diff --git a/packages/apollo-server-core/src/types.ts b/packages/apollo-server-core/src/types.ts
@@ -26,6 +26,7 @@ import { CacheControlExtensionOptions } from 'apollo-cache-control';
 import { ApolloServerPlugin } from 'apollo-server-plugin-base';
 
 import { GraphQLSchemaModule } from '@apollographql/apollo-tools';
+import { GraphQLExecutor } from 'apollo-server-core/dist/requestPipelineAPI';
 export { GraphQLSchemaModule };
 
 export { KeyValueCache } from 'apollo-server-caching';
@@ -64,6 +65,11 @@ type BaseConfig = Pick<
   | 'cache'
 >;
 
+export interface GraphQLService {
+  schema: GraphQLSchema;
+  executor: GraphQLExecutor;
+}
+
 // This configuration is shared between all integrations and should include
 // fields that are not specific to a single integration
 export interface Config extends BaseConfig {
@@ -86,6 +92,7 @@ export interface Config extends BaseConfig {
   //https://github.com/jaydenseric/graphql-upload#type-uploadoptions
   uploads?: boolean | FileUploadOptions;
   playground?: PlaygroundConfig;
+  gateway?: GraphQLService;
 }
 
 export interface FileUploadOptions {