fix: strip @external fields in interface extensions

packages/apollo-federation/src/composition/__tests__/utils.test.ts

@@ -20,6 +20,10 @@ describe('Composition utility functions', () => {
         type Mutation {
           updateProduct: Product
         }
+
+        extend interface Account @key(fields: "id") {
+          id: ID! @external
+        }
       `;
 
       const {
@@ -37,6 +41,8 @@ describe('Composition utility functions', () => {
         type Mutation {
           updateProduct: Product
         }
+
+        extend interface Account @key(fields: "id")
       `);
 
       expect(strippedFields).toMatchInlineSnapshot(`
@@ -46,6 +52,11 @@ describe('Composition utility functions', () => {
                     "parentTypeName": "Product",
                     "serviceName": "serviceA",
                   },
+                  Object {
+                    "field": id: ID! @external,
+                    "parentTypeName": "Account",
+                    "serviceName": "serviceA",
+                  },
                 ]
             `);
     });

packages/apollo-federation/src/composition/utils.ts

@@ -1,6 +1,7 @@
 import 'apollo-server-env';
 import {
   ObjectTypeDefinitionNode,
+  InterfaceTypeExtensionNode,
   FieldDefinitionNode,
   Kind,
   StringValueNode,
@@ -45,7 +46,10 @@ export function mapFieldNamesToServiceName<Node extends { name: NameNode }>(
 
 export function findDirectivesOnTypeOrField(
   node: Maybe<
-    ObjectTypeDefinitionNode | ObjectTypeExtensionNode | FieldDefinitionNode
+    | ObjectTypeDefinitionNode
+    | ObjectTypeExtensionNode
+    | FieldDefinitionNode
+    | InterfaceTypeExtensionNode
   >,
   directiveName: string,
 ) {
@@ -66,36 +70,55 @@ export function stripExternalFieldsFromTypeDefs(
   const strippedFields: ExternalFieldDefinition[] = [];
 
   const typeDefsWithoutExternalFields = visit(typeDefs, {
-    ObjectTypeExtension(node) {
-      let fields = node.fields;
-      if (fields) {
-        fields = fields.filter(field => {
-          const externalDirectives = findDirectivesOnTypeOrField(
-            field,
-            'external',
-          );
-
-          if (externalDirectives.length > 0) {
-            strippedFields.push({
-              field,
-              parentTypeName: node.name.value,
-              serviceName,
-            });
-            return false;
-          }
-          return true;
-        });
-      }
-      return {
-        ...node,
-        fields,
-      };
-    },
+    ObjectTypeExtension: removeExternalFieldsFromExtensionVisitor(
+      strippedFields,
+      serviceName,
+    ),
+    InterfaceTypeExtension: removeExternalFieldsFromExtensionVisitor(
+      strippedFields,
+      serviceName,
+    ),
   }) as DocumentNode;
 
   return { typeDefsWithoutExternalFields, strippedFields };
 }
 
+/**
+ * Returns a closure that strips fields marked with `@external` and adds them
+ * to an array.
+ * @param collector
+ * @param serviceName
+ */
+function removeExternalFieldsFromExtensionVisitor<
+  T extends InterfaceTypeExtensionNode | ObjectTypeExtensionNode
+>(collector: ExternalFieldDefinition[], serviceName: string) {
+  return (node: T) => {
+    let fields = node.fields;
+    if (fields) {
+      fields = fields.filter(field => {
+        const externalDirectives = findDirectivesOnTypeOrField(
+          field,
+          'external',
+        );
+
+        if (externalDirectives.length > 0) {
+          collector.push({
+            field,
+            parentTypeName: node.name.value,
+            serviceName,
+          });
+          return false;
+        }
+        return true;
+      });
+    }
+    return {
+      ...node,
+      fields,
+    };
+  };
+}
+
 export function parseSelections(source: string) {
   return (parse(`query { ${source} }`)
     .definitions[0] as OperationDefinitionNode).selectionSet.selections;