From fd9f6260faa779b2bfc12f1f707cdf2b778d306b Mon Sep 17 00:00:00 2001
From: Sebastian Richter <sebastian.max.richter@gmail.com>
Date: Tue, 9 Jan 2018 09:25:16 +0100
Subject: [PATCH] Include astNode in schema recreation (#569)

* Update schemaRecreation.ts

`mergeSchemas` does not set `astNode` properties, when recreating types.
But `CacheControlExtension.willResolveField` uses the `astNode` property in order to get the `cacheControl` directives.
---
 CHANGELOG.md                      | 1 +
 src/stitching/schemaRecreation.ts | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 940a523252f..15ed6f9e7af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Added GraphQL Subscriptions support for schema stitching and `makeRemoteExecutableSchema` [PR #563](https://github.com/apollographql/graphql-tools/pull/563)
 * Make `apollo-link` a direct dependency [PR #561](https://github.com/apollographql/graphql-tools/pull/561)
 * Update tests to use `graphql-js@0.12` docstring format [PR #559](https://github.com/apollographql/graphql-tools/pull/559)
+* Include `astNode` property in schema recreation
 
 ### v2.15.0
 
diff --git a/src/stitching/schemaRecreation.ts b/src/stitching/schemaRecreation.ts
index 0e4e3983850..ee8300c4db1 100644
--- a/src/stitching/schemaRecreation.ts
+++ b/src/stitching/schemaRecreation.ts
@@ -34,6 +34,7 @@ export function recreateCompositeType(
       name: type.name,
       description: type.description,
       isTypeOf: type.isTypeOf,
+      astNode: type.astNode,
       fields: () => fieldMapToFieldConfigMap(fields, registry),
       interfaces: () => interfaces.map(iface => registry.resolveType(iface)),
     });
@@ -43,6 +44,7 @@ export function recreateCompositeType(
     return new GraphQLInterfaceType({
       name: type.name,
       description: type.description,
+      astNode: type.astNode,
       fields: () => fieldMapToFieldConfigMap(fields, registry),
       resolveType: (parent, context, info) =>
         resolveFromParentTypename(parent, info.schema),
@@ -51,6 +53,7 @@ export function recreateCompositeType(
     return new GraphQLUnionType({
       name: type.name,
       description: type.description,
+      astNode: type.astNode,
       types: () =>
         type.getTypes().map(unionMember => registry.resolveType(unionMember)),
       resolveType: (parent, context, info) =>
@@ -60,6 +63,7 @@ export function recreateCompositeType(
     return new GraphQLInputObjectType({
       name: type.name,
       description: type.description,
+      astNode: type.astNode,
       fields: () => inputFieldMapToFieldConfigMap(type.getFields(), registry),
     });
   } else {