apollographql · clenfest · Jan 27, 2022 · Jan 19, 2022 · Jan 14, 2022 · Jan 13, 2022
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/federation-integration-testsuite-js/package.json b/federation-integration-testsuite-js/package.json
@@ -22,6 +22,6 @@
     "pretty-format": "^27.4.6"
   },
   "peerDependencies": {
-    "graphql": "^15.7.2"
+    "graphql": "^15.7.2 || ^16.0.0"
   }
 }
diff --git a/federation-integration-testsuite-js/src/fixtures/index.ts b/federation-integration-testsuite-js/src/fixtures/index.ts
@@ -8,7 +8,7 @@ import * as reviewsWithUpdate from './special-cases/reviewsWithUpdate';
 import * as accountsWithoutTag from './special-cases/accountsWithoutTag';
 import * as reviewsWithoutTag from './special-cases/reviewsWithoutTag';
 import { DocumentNode } from 'graphql';
-import { GraphQLResolverMap } from 'apollo-graphql';
+import { GraphQLResolverMap } from '../resolverMap';
 
 export interface Fixture {
   name: string;

diff --git a/federation-js/package.json b/federation-js/package.json
@@ -24,11 +24,10 @@
   },
   "dependencies": {
     "@apollo/subgraph": "file:../subgraph-js",
-    "apollo-graphql": "^0.9.5",
     "apollo-server-types": "^3.0.2",
     "lodash.xorby": "^4.7.0"
   },
   "peerDependencies": {
-    "graphql": "^15.5.3"
+    "graphql": "^15.5.3 || ^16.0.0"
   }
 }
diff --git a/federation-js/src/composition/DirectiveMetadata.ts b/federation-js/src/composition/DirectiveMetadata.ts
@@ -1,5 +1,4 @@
 import {
-  ASTNode,
   DirectiveNode,
   FieldDefinitionNode,
   GraphQLInterfaceType,
@@ -13,7 +12,7 @@ import {
   UnionTypeDefinitionNode,
   UnionTypeExtensionNode,
   visit,
-  VisitFn,
+  ASTVisitFn,
 } from 'graphql';
 import { mapGetOrSet } from '../utilities';
 import { ServiceDefinition } from './types';
@@ -70,7 +69,7 @@ export class DirectiveMetadata {
   // `this.directiveUsagesPerSubgraph`.
   getTypeVisitor(
     subgraphName: string,
-  ): VisitFn<ASTNode, ObjectInterfaceOrUnionTypeNode> {
+  ): ASTVisitFn<ObjectInterfaceOrUnionTypeNode> {
     function collectDirectiveUsages(
       node: ObjectInterfaceOrUnionTypeNode | FieldDefinitionNode,
       usagesOnNode: DirectiveUsages,

diff --git a/federation-js/src/composition/__tests__/composeAndValidate.test.ts b/federation-js/src/composition/__tests__/composeAndValidate.test.ts
@@ -18,6 +18,7 @@ import {
   compositionHasErrors,
   CompositionResult,
 } from '../utils';
+import { isNotNullOrUndefined } from '../../utilities';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(typeSerializer);
@@ -911,14 +912,14 @@ describe('composition of schemas with directives', () => {
     const queryType = schema.getType('Query') as GraphQLObjectType;
     const field = queryType.getFields()['importantDirectives'];
 
-    expect(field.isDeprecated).toBe(true);
+    expect(isNotNullOrUndefined(field.deprecationReason)).toBe(true);
     expect(field.deprecationReason).toEqual(deprecationReason);
 
     if (isAtLeastGraphqlVersionFifteenPointOne) {
       const specifiedBy = schema.getDirective('specifiedBy');
       expect(specifiedBy).toMatchInlineSnapshot(`"@specifiedBy"`);
       const customScalar = schema.getType('MyScalar');
-      expect((customScalar as GraphQLScalarType).specifiedByUrl).toEqual(
+      expect((customScalar as GraphQLScalarType).specifiedByURL).toEqual(
         specUrl,
       );
     }

diff --git a/federation-js/src/composition/__tests__/utils.test.ts b/federation-js/src/composition/__tests__/utils.test.ts
@@ -636,7 +636,7 @@ describe('Composition utility functions', () => {
             `);
     });
 
-    it("doesn't mutate the input DocumentNode", () => {
+    it.skip("doesn't mutate the input DocumentNode", () => {
       const typeDefs = gql`
         type Query {
           product: Product

diff --git a/federation-js/src/composition/compose.ts b/federation-js/src/composition/compose.ts
@@ -19,7 +19,7 @@ import {
   NamedTypeNode,
   lexicographicSortSchema,
 } from 'graphql';
-import { transformSchema } from 'apollo-graphql';
+import { transformSchema } from '../schema-helper';
 import {
   directivesWithNoDefinitionNeeded,
   isDirectiveWithNoDefinitionNeeded,
@@ -57,13 +57,13 @@ import { DirectiveMetadata } from './DirectiveMetadata';
 import { getJoinDefinitions } from '../joinSpec';
 import { CoreDirective } from '../coreSpec';
 
-const EmptyQueryDefinition = {
+const EmptyQueryDefinition: TypeDefinitionNode = {
   kind: Kind.OBJECT_TYPE_DEFINITION,
   name: { kind: Kind.NAME, value: defaultRootOperationNameLookup.query },
   fields: [],
   serviceName: null,
 };
-const EmptyMutationDefinition = {
+const EmptyMutationDefinition: TypeDefinitionNode = {
   kind: Kind.OBJECT_TYPE_DEFINITION,
   name: { kind: Kind.NAME, value: defaultRootOperationNameLookup.mutation },
   fields: [],
@@ -442,7 +442,7 @@ export function buildSchemaFromDefinitionsAndExtensions({
     ],
   };
 
-  errors = validateSDL(definitionsDocument, schema, compositionRules);
+  errors = validateSDL(definitionsDocument, schema, compositionRules) as GraphQLError[];
 
   try {
     schema = extendSchema(schema, definitionsDocument, {

diff --git a/federation-js/src/composition/normalize.ts b/federation-js/src/composition/normalize.ts
@@ -6,7 +6,7 @@ import {
   ObjectTypeExtensionNode,
   Kind,
   InterfaceTypeDefinitionNode,
-  VisitFn,
+  ASTVisitFn,
   specifiedDirectives,
 } from 'graphql';
 import {
@@ -268,8 +268,7 @@ export function replaceExtendedDefinitionsWithExtensions(
 // object type: _Service
 // Query fields: _service, _entities
 export function stripCommonPrimitives(document: DocumentNode) {
-  const typeDefinitionVisitor: VisitFn<
-    any,
+  const typeDefinitionVisitor: ASTVisitFn<
     ObjectTypeDefinitionNode | ObjectTypeExtensionNode
   > = (node) => {
     // Remove the `_entities` and `_service` fields from the `Query` type

diff --git a/federation-js/src/composition/validate/preComposition/keyFieldsMissingExternal.ts b/federation-js/src/composition/validate/preComposition/keyFieldsMissingExternal.ts
@@ -7,7 +7,7 @@ import {
   GraphQLError,
   specifiedDirectives,
 } from 'graphql';
-import { buildSchemaFromSDL } from 'apollo-graphql';
+import { buildSchemaFromSDL } from '../../../schema-helper';
 import { knownSubgraphDirectives } from '@apollo/subgraph/dist/directives';
 import { ServiceDefinition } from '../../types';
 import {

diff --git a/federation-js/src/composition/validate/preNormalization/tagDirective.ts b/federation-js/src/composition/validate/preNormalization/tagDirective.ts
@@ -8,6 +8,7 @@ import {
   visit,
   BREAK,
   parse,
+  GraphQLError,
 } from 'graphql';
 import { KnownArgumentNamesOnDirectivesRule } from 'graphql/validation/rules/KnownArgumentNamesRule';
 import { ProvidedRequiredArgumentsOnDirectivesRule } from 'graphql/validation/rules/ProvidedRequiredArgumentsRule';
@@ -37,7 +38,7 @@ export const tagDirective = ({
     ProvidedRequiredArgumentsOnDirectivesRule,
   ];
 
-  const errors = validateSDL(typeDefs, undefined, directiveRules);
+  const errors = validateSDL(typeDefs, undefined, directiveRules) as GraphQLError[];
 
   let tagDirectiveDefinition: DirectiveDefinitionNode | undefined;
   visit(typeDefs, {

diff --git a/federation-js/src/composition/validate/sdl/__tests__/possibleTypeExtensions.test.ts b/federation-js/src/composition/validate/sdl/__tests__/possibleTypeExtensions.test.ts
@@ -4,6 +4,7 @@ import {
   GraphQLSchema,
   specifiedDirectives,
   extendSchema,
+  GraphQLError,
 } from 'graphql';
 import { validateSDL } from 'graphql/validation/validate';
 import { buildMapsFromServiceList } from '../../../compose';
@@ -76,7 +77,7 @@ describe('PossibleTypeExtensionsType', () => {
     const { definitions, extensions } = createDefinitionsDocumentForServices(
       serviceList,
     );
-    const errors = validateSDL(definitions, schema, [PossibleTypeExtensions]);
+    const errors = validateSDL(definitions, schema, [PossibleTypeExtensions]) as GraphQLError[];
     schema = extendSchema(schema, definitions, { assumeValidSDL: true });
     errors.push(...validateSDL(extensions, schema, [PossibleTypeExtensions]));
     expect(errors).toHaveLength(0);
@@ -97,7 +98,7 @@ describe('PossibleTypeExtensionsType', () => {
     const { definitions, extensions } = createDefinitionsDocumentForServices(
       serviceList,
     );
-    const errors = validateSDL(definitions, schema, [PossibleTypeExtensions]);
+    const errors = validateSDL(definitions, schema, [PossibleTypeExtensions]) as GraphQLError[];
     schema = extendSchema(schema, definitions, { assumeValidSDL: true });
     errors.push(...validateSDL(extensions, schema, [PossibleTypeExtensions]));
 
@@ -142,7 +143,7 @@ describe('PossibleTypeExtensionsType', () => {
     const { definitions, extensions } = createDefinitionsDocumentForServices(
       serviceList,
     );
-    const errors = validateSDL(definitions, schema, [PossibleTypeExtensions]);
+    const errors = validateSDL(definitions, schema, [PossibleTypeExtensions]) as GraphQLError[];
     schema = extendSchema(schema, definitions, { assumeValidSDL: true });
     errors.push(...validateSDL(extensions, schema, [PossibleTypeExtensions]));
     expect(errors).toMatchInlineSnapshot(`
@@ -193,7 +194,7 @@ describe('PossibleTypeExtensionsType', () => {
     const { definitions, extensions } = createDefinitionsDocumentForServices(
       serviceList,
     );
-    const errors = validateSDL(definitions, schema, [PossibleTypeExtensions]);
+    const errors = validateSDL(definitions, schema, [PossibleTypeExtensions]) as GraphQLError[];
     schema = extendSchema(schema, definitions, { assumeValidSDL: true });
     errors.push(...validateSDL(extensions, schema, [PossibleTypeExtensions]));
     schema = extendSchema(schema, extensions, { assumeValidSDL: true });

diff --git a/federation-js/src/composition/validate/sdl/__tests__/uniqueFieldDefinitionNames.test.ts b/federation-js/src/composition/validate/sdl/__tests__/uniqueFieldDefinitionNames.test.ts
@@ -4,6 +4,7 @@ import {
   DocumentNode,
   Kind,
   extendSchema,
+  GraphQLError,
 } from 'graphql';
 import { validateSDL } from 'graphql/validation/validate';
 import gql from 'graphql-tag';
@@ -68,7 +69,7 @@ describe('UniqueFieldDefinitionNames', () => {
 
       const errors = validateSDL(definitions, schema, [
         UniqueFieldDefinitionNames,
-      ]);
+      ]) as GraphQLError[];
       schema = extendSchema(schema, definitions, {
         assumeValidSDL: true,
       });
@@ -105,7 +106,7 @@ describe('UniqueFieldDefinitionNames', () => {
 
       const errors = validateSDL(definitions, schema, [
         UniqueFieldDefinitionNames,
-      ]);
+      ]) as GraphQLError[];
       schema = extendSchema(schema, definitions, { assumeValidSDL: true });
       errors.push(
         ...validateSDL(extensions, schema, [UniqueFieldDefinitionNames]),
@@ -138,7 +139,7 @@ describe('UniqueFieldDefinitionNames', () => {
 
       const errors = validateSDL(definitions, schema, [
         UniqueFieldDefinitionNames,
-      ]);
+      ]) as GraphQLError[];
       schema = extendSchema(schema, definitions, { assumeValidSDL: true });
       errors.push(
         ...validateSDL(extensions, schema, [UniqueFieldDefinitionNames]),

diff --git a/federation-js/src/composition/validate/sdl/uniqueFieldDefinitionNames.ts b/federation-js/src/composition/validate/sdl/uniqueFieldDefinitionNames.ts
@@ -14,7 +14,6 @@ import {
   isInputObjectType,
 } from 'graphql';
 import { SDLValidationContext } from 'graphql/validation/ValidationContext';
-import { TypeMap } from 'graphql/type/schema';
 import { Maybe } from '../../types';
 import { diffTypeNodes, logServiceAndType } from '../../utils';
 
@@ -59,7 +58,7 @@ export function UniqueFieldDefinitionNames(
   context: SDLValidationContext,
 ): ASTVisitor {
   const schema = context.getSchema();
-  const existingTypeMap: TypeMap = schema
+  const existingTypeMap = schema
     ? schema.getTypeMap()
     : Object.create(null);
   interface FieldToNameNodeMap {

diff --git a/federation-js/src/index.ts b/federation-js/src/index.ts
@@ -1,7 +1,6 @@
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import { deprecate } from 'util';
 
-export { GraphQLSchemaModule } from 'apollo-graphql';
 export * from './composition';
 
 /**