[gateway] Resolve nested references in a value type resolved from a top-level resolver

lib/gateway.js

@@ -154,18 +154,42 @@ function defineResolvers (schema, typeToServiceMap, serviceMap, typeFieldsToServ
               *  In these cases, we get the service from the typeFieldsToService map.
               */
             let service = serviceMap[typeFieldsToService[`${type}-${fieldName}`]]
-            if (!service) {
+            if (!service && (type.name === 'Query' || type.name === 'Mutation' || type.name === 'Subscription')) {
               /**
                * If there is no service for the type, it is a query, mutation or subscription
                */
               service = serviceMap[serviceForFieldType]
             }
             if (!service) {
-              /**
-               * If the type is a nested value type, the service can still be null or undefined.
-               * In these cases, we resolve from the parent.
-               */
-              field.resolve = (parent, args, context, info) => parent && parent[info.path.key]
+              service = serviceMap[serviceForFieldType]
+
+              if (!service) {
+                /**
+                 * If the type is a nested value type, the service can still be null or undefined.
+                 * In these cases, we resolve from the parent.
+                 */
+                field.resolve = (parent, args, context, info) => parent && parent[info.path.key]
+              } else {
+                // If the service is not null, then we resolve from the service
+                const isNonNull = field.astNode.type.kind === Kind.NON_NULL_TYPE
+                const leafKind = isNonNull ? field.astNode.type.type.kind : field.astNode.type.kind
+
+                if (leafKind === Kind.LIST_TYPE) {
+                  field.resolve = makeResolver({
+                    service,
+                    createOperation: createEntityReferenceResolverOperation,
+                    transformData: response => response ? response.json.data._entities : (isNonNull ? [] : null),
+                    isReference: true
+                  })
+                } else {
+                  field.resolve = makeResolver({
+                    service,
+                    createOperation: createEntityReferenceResolverOperation,
+                    transformData: response => response.json.data._entities[0],
+                    isReference: true
+                  })
+                }
+              }
             } else if (type.name === 'Subscription') {
               field.subscribe = makeResolver({
                 service,
@@ -183,7 +207,7 @@ function defineResolvers (schema, typeToServiceMap, serviceMap, typeFieldsToServ
                 isQuery: true
               })
             }
-          } else if (serviceForFieldType !== null && serviceForFieldType !== serviceForType) {
+          } else if (serviceForType && serviceForFieldType !== null && serviceForFieldType !== serviceForType) {
             /**
              * If there is a service for the field type and a service for the type and it is not the same service,
              * it is an entity

test/gateway/type-redefined.js

@@ -0,0 +1,172 @@
+'use strict'
+
+const { test } = require('tap')
+const Fastify = require('fastify')
+const GQL = require('../..')
+
+const users = {
+  1: {
+    id: 1,
+    name: 'John',
+    username: '@john'
+  },
+  2: {
+    id: 2,
+    name: 'Jane',
+    username: '@jane'
+  }
+}
+
+async function buildService () {
+  const app = Fastify()
+  const schema = `
+    extend type Query {
+      me: User
+    }
+
+    type PageInfo {
+      edges: [User]
+    }
+
+    type User @key(fields: "id") {
+      id: ID!
+      name: String
+      username: String
+    }
+  `
+
+  const resolvers = {
+    Query: {
+      me: () => {
+        return users['1']
+      }
+    }
+  }
+
+  const loaders = {
+    User: {
+      async __resolveReference (queries, { reply }) {
+        return queries.map(({ obj }) => users[obj.id])
+      }
+    }
+  }
+
+  app.register(GQL, {
+    schema,
+    resolvers,
+    loaders,
+    federationMetadata: true,
+    allowBatchedQueries: true
+  })
+
+  return app
+}
+
+async function buildServiceExternal () {
+  const app = Fastify()
+  const schema = `
+    extend type Query {
+      meWrap: PageInfo
+      meWrapDifferentName: PageInfoRenamed
+    }
+
+    type PageInfoRenamed {
+      edges: [User]
+    }
+
+    type PageInfo {
+      edges: [User]
+    }
+
+    type User @key(fields: "id") @extends {
+      id: ID! @external
+    }
+  `
+
+  const resolvers = {
+    Query: {
+      meWrap: () => {
+        return { edges: [{ id: '1', __typename: 'User' }] }
+      },
+      meWrapDifferentName: () => {
+        return { edges: [{ id: '1', __typename: 'User' }] }
+      }
+    }
+  }
+
+  app.register(GQL, {
+    schema,
+    resolvers,
+    federationMetadata: true,
+    allowBatchedQueries: true
+  })
+
+  return app
+}
+
+async function buildProxy (port1, port2) {
+  const proxy = Fastify()
+
+  proxy.register(GQL, {
+    graphiql: true,
+    gateway: {
+      services: [
+        {
+          name: 'ext1',
+          url: `http://localhost:${port1}/graphql`
+        },
+        {
+          name: 'ext2',
+          url: `http://localhost:${port2}/graphql`
+        }
+      ]
+    },
+    pollingInterval: 2000
+  })
+
+  return proxy
+}
+
+test('federated node should be able to redefine type', async (t) => {
+  const port1 = 3027
+  const serviceOne = await buildService()
+  await serviceOne.listen(port1)
+  t.teardown(() => { serviceOne.close() })
+
+  const port2 = 3028
+  const serviceTwo = await buildServiceExternal()
+  await serviceTwo.listen(port2)
+  t.teardown(() => { serviceTwo.close() })
+
+  const serviceProxy = await buildProxy(port1, port2)
+  await serviceProxy.ready()
+  t.teardown(() => { serviceProxy.close() })
+
+  {
+    const res = await serviceProxy.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `{
+        meWrap { edges { name }  }
+      }`
+      }
+    })
+
+    t.same(res.json(), { data: { meWrap: { edges: [{ name: 'John' }] } } })
+  }
+
+  {
+    const res = await serviceProxy.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `{
+        meWrapDifferentName { edges { name }  }
+      }`
+      }
+    })
+
+    t.same(res.json(), { data: { meWrapDifferentName: { edges: [{ name: 'John' }] } } })
+  }
+})