remove dependency on apollo-graphql and port over functions (#1364)

* remove dependencies on `apollo-graphql` and port over functions as required

federation-integration-testsuite-js/package.json

@@ -18,7 +18,6 @@
   },
   "homepage": "https://github.com/apollographql/federation#readme",
   "dependencies": {
-    "apollo-graphql": "^0.9.5",
     "graphql-tag": "^2.10.4",
     "pretty-format": "^27.0.0"
   }

federation-integration-testsuite-js/src/fixtures/accounts.ts

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { GraphQLResolverMap } from 'apollo-graphql';
+import { GraphQLResolverMap } from '../resolverMap';
 
 export const name = 'accounts';
 export const url = `https://${name}.api.com.invalid`;

federation-integration-testsuite-js/src/fixtures/books.ts

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { GraphQLResolverMap } from 'apollo-graphql';
+import { GraphQLResolverMap } from '../resolverMap';
 
 export const name = 'books';
 export const url = `https://${name}.api.com.invalid`;

federation-integration-testsuite-js/src/fixtures/inventory.ts

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { GraphQLResolverMap } from 'apollo-graphql';
+import { GraphQLResolverMap } from '../resolverMap';
 
 export const name = 'inventory';
 export const url = `https://${name}.api.com.invalid`;

federation-integration-testsuite-js/src/fixtures/product.ts

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { GraphQLResolverMap } from 'apollo-graphql';
+import { GraphQLResolverMap } from '../resolverMap';
 
 export const name = 'product';
 export const url = `https://${name}.api.com.invalid`;

federation-integration-testsuite-js/src/fixtures/reviews.ts

@@ -1,5 +1,5 @@
-import { GraphQLResolverMap } from 'apollo-graphql';
 import gql from 'graphql-tag';
+import { GraphQLResolverMap } from '../resolverMap';
 
 export const name = 'reviews';
 export const url = `https://${name}.api.com.invalid`;
@@ -153,7 +153,7 @@ const reviews = [
   },
 ];
 
-export const resolvers: GraphQLResolverMap<any> = {
+export const resolvers: GraphQLResolverMap<unknown> = {
   Query: {
     review(_, args) {
       return { id: args.id };

federation-integration-testsuite-js/src/resolverMap.ts

@@ -0,0 +1,23 @@
+import { GraphQLFieldResolver, GraphQLScalarType, DocumentNode } from 'graphql';
+
+export interface GraphQLSchemaModule {
+  typeDefs: DocumentNode;
+  resolvers?: GraphQLResolverMap<any>;
+}
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+export interface GraphQLResolverMap<TContext = {}> {
+  [typeName: string]:
+    | {
+        [fieldName: string]:
+          | GraphQLFieldResolver<any, TContext>
+          | {
+              requires?: string;
+              resolve: GraphQLFieldResolver<any, TContext>;
+            };
+      }
+    | GraphQLScalarType
+    | {
+        [enumValue: string]: string | number;
+      };
+}

gateway-js/package.json

@@ -30,7 +30,6 @@
     "@apollo/query-planner": "file:../query-planner-js",
     "@opentelemetry/api": "^1.0.1",
     "@types/node-fetch": "2.5.12",
-    "apollo-graphql": "^0.9.5",
     "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
     "apollo-server-caching": "^0.7.0 || ^3.0.0",
     "apollo-server-core": "^2.23.0 || ^3.0.0",

gateway-js/src/__tests__/executeQueryPlan.test.ts

@@ -4,7 +4,6 @@ import {
   GraphQLObjectType,
   print,
 } from 'graphql';
-import { addResolversToSchema, GraphQLResolverMap } from 'apollo-graphql';
 import gql from 'graphql-tag';
 import { GraphQLExecutionResult, GraphQLRequestContext } from 'apollo-server-types';
 import { AuthenticationError } from 'apollo-server-core';
@@ -21,6 +20,7 @@ import { ApolloGateway } from '..';
 import { ApolloServerBase as ApolloServer } from 'apollo-server-core';
 import { getFederatedTestingSchema } from './execution-utils';
 import { Schema, Operation, parseOperation, buildSchemaFromAST } from '@apollo/federation-internals';
+import { addResolversToSchema, GraphQLResolverMap } from '../schema-helper';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);

gateway-js/src/__tests__/execution-utils.ts

@@ -2,7 +2,7 @@ import {
   GraphQLSchemaValidationError,
   GraphQLSchemaModule,
   GraphQLResolverMap,
-} from 'apollo-graphql';
+} from '../schema-helper';
 import { GraphQLRequest, GraphQLExecutionResult, Logger } from 'apollo-server-types';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import {

gateway-js/src/__tests__/gateway/endToEnd.test.ts

@@ -1,10 +1,10 @@
-import { GraphQLSchemaModule } from 'apollo-graphql';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import { ApolloServer } from 'apollo-server';
 import fetch from 'node-fetch';
 import { ApolloGateway } from '../..';
 import { fixtures } from 'apollo-federation-integration-testsuite';
 import { ApolloServerPluginInlineTrace } from 'apollo-server-core';
+import { GraphQLSchemaModule } from '../../schema-helper';
 
 async function startFederatedServer(modules: GraphQLSchemaModule[]) {
   const schema = buildSubgraphSchema(modules);

gateway-js/src/__tests__/gateway/reporting.test.ts

@@ -1,6 +1,5 @@
 import { gunzipSync } from 'zlib';
 import nock from 'nock';
-import { GraphQLSchemaModule } from 'apollo-graphql';
 import gql from 'graphql-tag';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import { ApolloServer } from 'apollo-server';
@@ -14,6 +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';
 
 // Normalize specific fields that change often (eg timestamps) to static values,
 // to make snapshot testing viable.  (If these helpers are more generally

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 'apollo-graphql';
+import { GraphQLResolverMap } from '../../schema-helper';
 import { GraphQLRequestContext } from 'apollo-server-types';
 import { GraphQLDataSourceRequestKind } from '../types';
 

gateway-js/src/schema-helper/addResolversToSchema.ts

@@ -0,0 +1,83 @@
+import {
+  GraphQLSchema,
+  isObjectType,
+  GraphQLEnumType,
+  isAbstractType,
+  isScalarType,
+  isEnumType,
+  GraphQLEnumValueConfig,
+} from 'graphql';
+
+import { GraphQLResolverMap } from './resolverMap';
+
+export function addResolversToSchema(
+  schema: GraphQLSchema,
+  resolvers: GraphQLResolverMap<any>
+) {
+  for (const [typeName, fieldConfigs] of Object.entries(resolvers)) {
+    const type = schema.getType(typeName);
+
+    if (isAbstractType(type)) {
+      for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
+        if (fieldName.startsWith("__")) {
+          (type as any)[fieldName.substring(2)] = fieldConfig;
+        }
+      }
+    }
+
+    if (isScalarType(type)) {
+      for (const fn in fieldConfigs) {
+        (type as any)[fn] = (fieldConfigs as any)[fn];
+      }
+    }
+
+    if (isEnumType(type)) {
+      const values = type.getValues();
+      const newValues: { [key: string]: GraphQLEnumValueConfig } = {};
+      values.forEach(value => {
+        let newValue = (fieldConfigs as any)[value.name];
+        if (newValue === undefined) {
+          newValue = value.name;
+        }
+
+        newValues[value.name] = {
+          value: newValue,
+          deprecationReason: value.deprecationReason,
+          description: value.description,
+          astNode: value.astNode,
+          extensions: undefined
+        };
+      });
+
+      // In place updating hack to get around pulling in the full
+      // schema walking and immutable updating machinery from graphql-tools
+      Object.assign(
+        type,
+        new GraphQLEnumType({
+          ...type.toConfig(),
+          values: newValues
+        })
+      );
+    }
+
+    if (!isObjectType(type)) continue;
+
+    const fieldMap = type.getFields();
+
+    for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
+      if (fieldName.startsWith("__")) {
+        (type as any)[fieldName.substring(2)] = fieldConfig;
+        continue;
+      }
+
+      const field = fieldMap[fieldName];
+      if (!field) continue;
+
+      if (typeof fieldConfig === "function") {
+        field.resolve = fieldConfig;
+      } else {
+        field.resolve = fieldConfig.resolve;
+      }
+    }
+  }
+}

gateway-js/src/schema-helper/error.ts

@@ -0,0 +1,11 @@
+import { GraphQLError } from "graphql";
+
+export class GraphQLSchemaValidationError extends Error {
+  constructor(public errors: ReadonlyArray<GraphQLError>) {
+    super();
+
+    this.name = this.constructor.name;
+    Error.captureStackTrace(this, this.constructor);
+    this.message = errors.map(error => error.message).join("\n\n");
+  }
+}

gateway-js/src/schema-helper/index.ts

@@ -0,0 +1,3 @@
+export * from './resolverMap';
+export * from './addResolversToSchema';
+export * from './error';

gateway-js/src/schema-helper/resolverMap.ts

@@ -0,0 +1,23 @@
+import { GraphQLFieldResolver, GraphQLScalarType, DocumentNode } from 'graphql';
+
+export interface GraphQLSchemaModule {
+  typeDefs: DocumentNode;
+  resolvers?: GraphQLResolverMap<any>;
+}
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+export interface GraphQLResolverMap<TContext = {}> {
+  [typeName: string]:
+    | {
+        [fieldName: string]:
+          | GraphQLFieldResolver<any, TContext>
+          | {
+              requires?: string;
+              resolve: GraphQLFieldResolver<any, TContext>;
+            };
+      }
+    | GraphQLScalarType
+    | {
+        [enumValue: string]: string | number;
+      };
+}

query-planner-js/package.json

@@ -27,7 +27,6 @@
   "dependencies": {
     "@apollo/federation-internals": "file:../internals-js",
     "@apollo/query-graphs": "file:../query-graphs-js",
-    "apollo-graphql": "^0.9.5",
     "chalk": "^4.1.0",
     "deep-equal": "^2.0.5",
     "pretty-format": "^27.0.0"

subgraph-js/package.json

@@ -24,7 +24,6 @@
     "access": "public"
   },
   "dependencies": {
-    "apollo-graphql": "^0.9.5"
   },
   "peerDependencies": {
     "graphql": "^15.7.0"

subgraph-js/src/buildSubgraphSchema.ts

@@ -9,13 +9,14 @@ import {
   specifiedDirectives,
 } from 'graphql';
 import {
-  buildSchemaFromSDL,
-  transformSchema,
   GraphQLSchemaModule,
-  modulesFromSDL,
-  addResolversToSchema,
   GraphQLResolverMap,
-} from 'apollo-graphql';
+  addResolversToSchema,
+  modulesFromSDL,
+  transformSchema,
+  buildSchemaFromSDL,
+} from './schema-helper';
+
 import { federationDirectives, typeIncludesDirective } from './directives';
 
 import { serviceField, entitiesField, EntityType } from './types';