__resolveReference follow-ups (#1757)

apollographql · Apr 22, 2022 · 8a5338c · 8a5338c
1 parent dba2207
commit 8a5338c
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 157 deletions.
diff --git a/gateway-js/src/__tests__/executeQueryPlan.test.ts b/gateway-js/src/__tests__/executeQueryPlan.test.ts
@@ -20,7 +20,10 @@ import { ApolloGateway } from '..';
 import { ApolloServerBase as ApolloServer } from 'apollo-server-core';
 import { getFederatedTestingSchema } from './execution-utils';
 import { Schema, Operation, parseOperation, buildSchemaFromAST, arrayEquals } from '@apollo/federation-internals';
-import { addResolversToSchema, GraphQLResolverMap } from '../schema-helper';
+import {
+  addResolversToSchema,
+  GraphQLResolverMap,
+} from '@apollo/subgraph/src/schema-helper';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);

diff --git a/gateway-js/src/__tests__/execution-utils.ts b/gateway-js/src/__tests__/execution-utils.ts
@@ -1,8 +1,8 @@
 import {
-  GraphQLSchemaValidationError,
   GraphQLSchemaModule,
   GraphQLResolverMap,
-} from '../schema-helper';
+  GraphQLSchemaValidationError,
+} from '@apollo/subgraph/src/schema-helper';
 import { GraphQLRequest, GraphQLExecutionResult } from 'apollo-server-types';
 import type { Logger } from '@apollo/utils.logger';
 import { buildSubgraphSchema } from '@apollo/subgraph';

diff --git a/gateway-js/src/__tests__/gateway/endToEnd.test.ts b/gateway-js/src/__tests__/gateway/endToEnd.test.ts
@@ -4,7 +4,7 @@ import fetch, { Response } from 'node-fetch';
 import { ApolloGateway } from '../..';
 import { fixtures } from 'apollo-federation-integration-testsuite';
 import { ApolloServerPluginInlineTrace } from 'apollo-server-core';
-import { GraphQLSchemaModule } from '../../schema-helper';
+import { GraphQLSchemaModule } from '@apollo/subgraph/src/schema-helper';
 import { buildSchema, ObjectType, ServiceDefinition } from '@apollo/federation-internals';
 import gql from 'graphql-tag';
 import { printSchema } from 'graphql';

diff --git a/gateway-js/src/__tests__/gateway/reporting.test.ts b/gateway-js/src/__tests__/gateway/reporting.test.ts
@@ -13,7 +13,7 @@ import { Plugin, Config, Refs } from 'pretty-format';
 import { Report, Trace } from 'apollo-reporting-protobuf';
 import { fixtures } from 'apollo-federation-integration-testsuite';
 import { nockAfterEach, nockBeforeEach } from '../nockAssertions';
-import { GraphQLSchemaModule } from '../../schema-helper';
+import { GraphQLSchemaModule } from '@apollo/subgraph/src/schema-helper';
 import resolvable, { Resolvable } from '@josephg/resolvable';
 
 // Normalize specific fields that change often (eg timestamps) to static values,

diff --git a/gateway-js/src/datasources/__tests__/LocalGraphQLDataSource.test.ts b/gateway-js/src/datasources/__tests__/LocalGraphQLDataSource.test.ts
@@ -1,7 +1,7 @@
 import { LocalGraphQLDataSource } from '../LocalGraphQLDataSource';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import gql from 'graphql-tag';
-import { GraphQLResolverMap } from '../../schema-helper';
+import { GraphQLResolverMap } from '@apollo/subgraph/src/schema-helper';
 import { GraphQLRequestContext } from 'apollo-server-types';
 import { GraphQLDataSourceRequestKind } from '../types';
 

diff --git a/gateway-js/src/schema-helper/addResolversToSchema.ts b/gateway-js/src/schema-helper/addResolversToSchema.ts
diff --git a/gateway-js/src/schema-helper/error.ts b/gateway-js/src/schema-helper/error.ts
diff --git a/gateway-js/src/schema-helper/index.ts b/gateway-js/src/schema-helper/index.ts
diff --git a/gateway-js/src/schema-helper/resolverMap.ts b/gateway-js/src/schema-helper/resolverMap.ts
diff --git a/subgraph-js/src/schema-helper/buildSchemaFromSDL.ts b/subgraph-js/src/schema-helper/buildSchemaFromSDL.ts
@@ -108,19 +108,19 @@ export function addResolversToSchema(
 
     if (isAbstractType(type)) {
       for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
-        if (fieldName === "__resolveReference") {
+        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;
+        } else if (fieldName === '__resolveType') {
+          type.resolveType = fieldConfig;
         }
       }
     }
@@ -163,21 +163,21 @@ export function addResolversToSchema(
     if (!isObjectType(type)) continue;
 
     const fieldMap = type.getFields();
-
     for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
-      if (fieldName === "__resolveReference") {
+      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;
+      } else if (fieldName === '__isTypeOf') {
+        type.isTypeOf = fieldConfig;
         continue;
       }