Skip type resolution for null

.changeset/young-pigs-crash.md

@@ -0,0 +1,5 @@
+---
+"@apollo/subgraph": patch
+---
+
+When resolving references, skip type resolution if the reference resolves to null.

subgraph-js/src/__tests__/buildSubgraphSchema.test.ts

@@ -439,6 +439,112 @@ describe('buildSubgraphSchema', () => {
         }
       `);
     });
+
+    it('skips `resolveType` if `resolveReference` returns null', async () => {
+      const query = `#graphql
+        query Product {
+          _entities(representations: [{ __typename: "Product", key: "unknown" }]) {
+            __typename
+            ... on Product {
+              type
+              key
+            }
+          }
+        }
+      `;
+      const schema = buildSubgraphSchema([
+        {
+          typeDefs: gql`
+            extend schema
+              @link(
+                url: "https://specs.apollo.dev/federation/v2.8"
+                import: ["@key"]
+              )
+
+            enum ProductType {
+              A
+              B
+            }
+
+            interface Product @key(fields: "key") {
+              type: ProductType!
+              key: String!
+            }
+
+            type ProductA implements Product @key(fields: "key") {
+              type: ProductType!
+              key: String!
+            }
+
+            type ProductB implements Product @key(fields: "key") {
+              type: ProductType!
+              key: String!
+            }
+          `,
+          resolvers: {
+            Product: {
+              __resolveReference: async ({ key }: { key: string }) => {
+                if (key === 'a') {
+                  return {
+                    type: 'A',
+                    key,
+                  };
+                } else if (key === 'b') {
+                  return {
+                    type: 'B',
+                    key,
+                  };
+                } else {
+                  return null;
+                }
+              },
+              __resolveType: async (entity: { type: 'A' | 'B' }) => {
+                switch (entity.type) {
+                  case 'A':
+                    return 'ProductA';
+                  case 'B':
+                    return 'ProductB';
+                  default:
+                    throw new Error('Unknown type');
+                }
+              },
+            },
+            ProductA: {
+              __resolveReference: async ({ key }: { key: string }) => {
+                return {
+                  type: 'ProductA',
+                  key,
+                };
+              },
+            },
+            ProductB: {
+              __resolveReference: async ({ key }: { key: string }) => {
+                return {
+                  type: 'ProductB',
+                  key,
+                };
+              },
+            },
+          },
+        },
+      ]);
+
+      const { data, errors } = await graphql({
+        schema,
+        source: query,
+        rootValue: null,
+        contextValue: null,
+        variableValues: null,
+      });
+      expect(errors).toBeUndefined();
+      expect(data).toMatchInlineSnapshot(`
+        Object {
+          "_entities": Array [
+            null,
+          ],
+        }
+      `);
+    });
   });
 
   describe('_service root field', () => {

subgraph-js/src/types.ts

@@ -162,15 +162,20 @@ async function withResolvedType<T>({
   info: GraphQLResolveInfo,
   callback: (runtimeType: GraphQLObjectType) => PromiseOrValue<T>,
 }): Promise<T> {
+  const resolvedValue = await value;
+  if (resolvedValue === null) {
+    return resolvedValue;
+  }
+
   const resolveTypeFn = type.resolveType ?? defaultTypeResolver;
-  const runtimeType = resolveTypeFn(await value, context, info, type);
+  const runtimeType = resolveTypeFn(resolvedValue, context, info, type);
   if (isPromise(runtimeType)) {
     return runtimeType.then((name) => (
-      callback(ensureValidRuntimeType(name, info.schema, type, value))
+      callback(ensureValidRuntimeType(name, info.schema, type, resolvedValue))
     ));
   }
 
-  return callback(ensureValidRuntimeType(runtimeType, info.schema, type, value));
+  return callback(ensureValidRuntimeType(runtimeType, info.schema, type, resolvedValue));
 }
 
 function definedResolveReference(type: GraphQLObjectType | GraphQLInterfaceType): GraphQLReferenceResolver<any> | undefined {