Remove EXTERNAL_MISSING_ON_BASE error

Author: vitramir

packages/apollo-federation/src/composition/validate/postComposition/__tests__/externalMissingOnBase.test.ts

@@ -6,7 +6,7 @@ import { graphqlErrorSerializer } from '../../../../snapshotSerializers';
 expect.addSnapshotSerializer(graphqlErrorSerializer);
 
 describe('externalMissingOnBase', () => {
-  it('warns when an @external field does not have a matching field on the base type', () => {
+  it.skip('warns when an @external field does not have a matching field on the base type', () => {
     const serviceA = {
       typeDefs: gql`
         type Product @key(fields: "sku") {

packages/apollo-federation/src/composition/validate/postComposition/externalMissingOnBase.ts

@@ -41,18 +41,18 @@ export const externalMissingOnBase: PostCompositionValidator = ({ schema }) => {
 
           // if the field has a serviceName, then it wasn't defined by the
           // service that owns the type
-          if (
-            matchingBaseField.federation &&
-            matchingBaseField.federation.serviceName
-          ) {
-            errors.push(
-              errorWithCode(
-                'EXTERNAL_MISSING_ON_BASE',
-                logServiceAndType(serviceName, typeName, externalFieldName) +
-                  `marked @external but ${externalFieldName} was defined in ${matchingBaseField.federation.serviceName}, not in the service that owns ${typeName} (${namedType.federation.serviceName})`,
-              ),
-            );
-          }
+          // if (
+          //   matchingBaseField.federation &&
+          //   matchingBaseField.federation.serviceName
+          // ) {
+          //   errors.push(
+          //     errorWithCode(
+          //       'EXTERNAL_MISSING_ON_BASE',
+          //       logServiceAndType(serviceName, typeName, externalFieldName) +
+          //         `marked @external but ${externalFieldName} was defined in ${matchingBaseField.federation.serviceName}, not in the service that owns ${typeName} (${namedType.federation.serviceName})`,
+          //     ),
+          //   );
+          // }
         }
       }
     }

packages/apollo-gateway/src/FieldSet.ts

@@ -8,6 +8,7 @@ import {
   SelectionNode,
   SelectionSetNode,
   GraphQLObjectType,
+  isObjectType,
 } from 'graphql';
 import { getResponseName } from './utilities/graphql';
 
@@ -41,7 +42,11 @@ export function printFields(fields?: FieldSet) {
 export function matchesField(field: Field) {
   // TODO: Compare parent type and arguments
   return (otherField: Field) => {
-    return field.fieldDef.name === otherField.fieldDef.name;
+    return (
+      field.fieldDef.name === otherField.fieldDef.name &&
+      isObjectType(field.scope.parentType) &&
+      otherField.scope.possibleTypes.includes(field.scope.parentType)
+    );
   };
 }
 

packages/apollo-gateway/src/__tests__/__fixtures__/schemas/product.ts

@@ -29,6 +29,7 @@ export const typeDefs = gql`
     name: String
     price: String
     details: ProductDetails
+    manufacturer: String
   }
 
   interface ProductDetails {
@@ -53,6 +54,7 @@ export const typeDefs = gql`
     brand: Brand
     metadata: [MetadataOrError]
     details: ProductDetailsFurniture
+    manufacturer: String
   }
 
   extend type Book implements Product @key(fields: "isbn") {
@@ -64,6 +66,7 @@ export const typeDefs = gql`
     name(delimeter: String = " "): String @requires(fields: "title year")
     price: String
     details: ProductDetailsBook
+    manufacturer: String
   }
 
   interface Vehicle {

packages/apollo-gateway/src/__tests__/__fixtures__/schemas/reviews.ts

@@ -14,7 +14,7 @@ export const typeDefs = gql`
     id: ID!
     body(format: Boolean = false): String
     author: User @provides(fields: "username")
-    product: Product
+    product: Product @provides(fields: "manufacturer")
     metadata: [MetadataOrError]
   }
 
@@ -36,16 +36,18 @@ export const typeDefs = gql`
     goodAddress: Boolean @requires(fields: "metadata { address }")
   }
 
-  extend interface Product {
+  extend interface Product @key(fields:"upc") {
     reviews: [Review]
   }
 
   extend type Furniture implements Product @key(fields: "upc") {
+    manufacturer: String @external
     upc: String! @external
     reviews: [Review]
   }
 
   extend type Book implements Product @key(fields: "isbn") {
+    manufacturer: String @external
     isbn: String! @external
     reviews: [Review]
     similarBooks: [Book]! @external
@@ -98,14 +100,14 @@ const reviews = [
   {
     id: '1',
     authorID: '1',
-    product: { __typename: 'Furniture', upc: '1' },
+    product: { __typename: 'Furniture', upc: '1', manufacturer:'factoryA' },
     body: 'Love it!',
     metadata: [{ code: 418, message: "I'm a teapot" }],
   },
   {
     id: '2',
     authorID: '1',
-    product: { __typename: 'Furniture', upc: '2' },
+    product: { __typename: 'Furniture', upc: '2', manufacturer:'factoryB' },
     body: 'Too expensive.',
   },
   {

packages/apollo-gateway/src/buildQueryPlan.ts

@@ -331,7 +331,10 @@ function splitSubfields(
           parentGroup.providedFields.some(matchesField(requiredField)),
         )
       ) {
-        if (owningService === parentGroup.serviceName) {
+        if (
+          owningService === parentGroup.serviceName ||
+          parentGroup.providedFields.some(matchesField(field))
+        ) {
           return parentGroup;
         } else {
           return parentGroup.dependentGroupForService(