Move __resolveReference resolvers on to extensions (#1746)

The entity __resolveReference resolver is currently placed directly on to GraphQL*Type objects. This breaks the API, as the expectation is to put things like this on to the `extensions` field of objects contained within a GraphQLSchema. This moves the resolver off of the object and into the extensions where it belongs. Fixes: #1131 Fixes: ardatan/graphql-tools#2687 Fixes: ardatan/graphql-tools#2857
apollographql · Apr 20, 2022 · 4e3c161 · 4e3c161
1 parent 4fbf2ff
commit 4e3c161
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 11 deletions.
diff --git a/gateway-js/src/schema-helper/addResolversToSchema.ts b/gateway-js/src/schema-helper/addResolversToSchema.ts
@@ -19,7 +19,18 @@ export function addResolversToSchema(
 
     if (isAbstractType(type)) {
       for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
-        if (fieldName.startsWith("__")) {
+        if (fieldName === "__resolveReference") {
+          type.extensions = {
+            ...type.extensions,
+            apollo: {
+              ...type.extensions.apollo,
+              subgraph: {
+                ...type.extensions.apollo?.subgraph,
+                resolveReference: fieldConfig,
+              }
+            },
+          };
+        } else if (fieldName.startsWith("__")) {
           (type as any)[fieldName.substring(2)] = fieldConfig;
         }
       }
@@ -65,7 +76,18 @@ export function addResolversToSchema(
     const fieldMap = type.getFields();
 
     for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
-      if (fieldName.startsWith("__")) {
+      if (fieldName === "__resolveReference") {
+        type.extensions = {
+          ...type.extensions,
+          apollo: {
+            ...type.extensions.apollo,
+            subgraph: {
+              ...type.extensions.apollo?.subgraph,
+              resolveReference: fieldConfig,
+            }
+          },
+        };
+      } else if (fieldName.startsWith("__")) {
         (type as any)[fieldName.substring(2)] = fieldConfig;
         continue;
       }

diff --git a/gateway-js/src/typings/graphql.ts b/gateway-js/src/typings/graphql.ts
@@ -0,0 +1,31 @@
+import { GraphQLResolveInfo } from 'graphql';
+
+type GraphQLReferenceResolver<TContext> = (
+  reference: object,
+  context: TContext,
+  info: GraphQLResolveInfo,
+) => any;
+
+interface ApolloSubgraphExtensions<TContext> {
+  resolveReference?: GraphQLReferenceResolver<TContext>;
+}
+
+declare module 'graphql/type/definition' {
+  interface GraphQLObjectTypeExtensions<_TSource = any, _TContext = any> {
+    apollo?: {
+      subgraph?: ApolloSubgraphExtensions<_TContext>;
+    }
+  }
+
+  interface GraphQLInterfaceTypeExtensions<_TSource = any, _TContext = any> {
+    apollo?: {
+      subgraph?: ApolloSubgraphExtensions<_TContext>;
+    }
+  }
+
+  interface GraphQLUnionTypeExtensions<_TSource = any, _TContext = any> {
+    apollo?: {
+      subgraph?: ApolloSubgraphExtensions<_TContext>;
+    }
+  }
+}
diff --git a/subgraph-js/src/schema-helper/buildSchemaFromSDL.ts b/subgraph-js/src/schema-helper/buildSchemaFromSDL.ts
@@ -108,7 +108,18 @@ export function addResolversToSchema(
 
     if (isAbstractType(type)) {
       for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
-        if (fieldName.startsWith("__")) {
+        if (fieldName === "__resolveReference") {
+          type.extensions = {
+            ...type.extensions,
+            apollo: {
+              ...type.extensions.apollo,
+              subgraph: {
+                ...type.extensions.apollo?.subgraph,
+                resolveReference: fieldConfig,
+              }
+            },
+          };
+        } else if (fieldName.startsWith("__")) {
           (type as any)[fieldName.substring(2)] = fieldConfig;
         }
       }
@@ -154,7 +165,18 @@ export function addResolversToSchema(
     const fieldMap = type.getFields();
 
     for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
-      if (fieldName.startsWith("__")) {
+      if (fieldName === "__resolveReference") {
+        type.extensions = {
+          ...type.extensions,
+          apollo: {
+            ...type.extensions.apollo,
+            subgraph: {
+              ...type.extensions.apollo?.subgraph,
+              resolveReference: fieldConfig,
+            }
+          },
+        };
+      } else if (fieldName.startsWith("__")) {
         (type as any)[fieldName.substring(2)] = fieldConfig;
         continue;
       }

diff --git a/subgraph-js/src/schemaExtensions.ts b/subgraph-js/src/schemaExtensions.ts
@@ -6,12 +6,26 @@ type GraphQLReferenceResolver<TContext> = (
   info: GraphQLResolveInfo,
 ) => any;
 
+interface ApolloSubgraphExtensions<TContext> {
+  resolveReference?: GraphQLReferenceResolver<TContext>;
+}
+
 declare module 'graphql/type/definition' {
-  interface GraphQLObjectType {
-    resolveReference?: GraphQLReferenceResolver<any>;
+  interface GraphQLObjectTypeExtensions<_TSource = any, _TContext = any> {
+    apollo?: {
+      subgraph?: ApolloSubgraphExtensions<_TContext>;
+    };
+  }
+
+  interface GraphQLInterfaceTypeExtensions<_TSource = any, _TContext = any> {
+    apollo?: {
+      subgraph?: ApolloSubgraphExtensions<_TContext>;
+    };
   }
 
-  interface GraphQLObjectTypeConfig<TSource, TContext> {
-    resolveReference?: GraphQLReferenceResolver<TContext>;
+  interface GraphQLUnionTypeExtensions<_TSource = any, _TContext = any> {
+    apollo?: {
+      subgraph?: ApolloSubgraphExtensions<_TContext>;
+    };
   }
 }
diff --git a/subgraph-js/src/types.ts b/subgraph-js/src/types.ts
@@ -93,9 +93,9 @@ export function entitiesResolver({
       }
     }
 
-    const resolveReference = type.resolveReference
-      ? type.resolveReference
-      : function defaultResolveReference() {
+    const resolveReference =
+      type.extensions.apollo?.subgraph?.resolveReference ??
+      function defaultResolveReference() {
         return reference;
       };