Remove apollo-env dependency from @apollo/federation package (#3463)

Currently, a circular dependency exists between apollo-env and
@apollo-federation such that the apollo-tooling repo is unable to
publish due to requiring multiple versions of apollo-env (one old
and one new).

This commit removes the circular dependency, which unblocks the
ability for apollo-tooling to publish.

packages/apollo-federation/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 > The changes noted within this `vNEXT` section have not been released yet.  New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development.  When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section.
 
-- _Nothing yet! Stay tuned!_
+* Remove `apollo-env` dependency to eliminate circular dependency between the two packages. This circular dependency makes the tooling repo unpublishable when `apollo-env` requires a version bump. [#3463](https://github.com/apollographql/apollo-server/pull/3463)
 
 ### v0.10.1
 

packages/apollo-federation/jest.config.js

@@ -1,5 +1,8 @@
 const config = require('../../jest.config.base');
 
 module.exports = Object.assign(Object.create(null), config, {
-  setupFiles: ['apollo-env'],
+  setupFiles: [
+    'core-js/features/array/flat',
+    'core-js/features/array/flat-map',
+  ],
 });

packages/apollo-federation/package.json

@@ -14,9 +14,9 @@
     "access": "public"
   },
   "dependencies": {
-    "apollo-env": "^0.5.1",
     "apollo-graphql": "^0.3.4",
     "apollo-server-env": "file:../apollo-server-env",
+    "core-js": "^3.4.0",
     "lodash.xorby": "^4.7.0"
   },
   "peerDependencies": {

packages/apollo-federation/src/composition/compose.ts

@@ -1,5 +1,4 @@
 import 'apollo-server-env';
-import 'apollo-env';
 import {
   GraphQLSchema,
   extendSchema,
@@ -18,9 +17,7 @@ import {
   TypeExtensionNode,
   GraphQLDirective,
 } from 'graphql';
-import { mapValues } from 'apollo-env';
 import { transformSchema } from 'apollo-graphql';
-
 import federationDirectives from '../directives';
 import {
   findDirectivesOnTypeOrField,
@@ -29,6 +26,7 @@ import {
   mapFieldNamesToServiceName,
   stripExternalFieldsFromTypeDefs,
   typeNodesAreEquivalent,
+  mapValues
 } from './utils';
 import {
   ServiceDefinition,

packages/apollo-federation/src/composition/utils.ts

@@ -1,5 +1,4 @@
 import 'apollo-server-env';
-import { isNotNullOrUndefined } from 'apollo-env';
 import {
   InterfaceTypeExtensionNode,
   FieldDefinitionNode,
@@ -447,3 +446,23 @@ export const defKindToExtKind: { [kind: string]: string } = {
   [Kind.ENUM_TYPE_DEFINITION]: Kind.ENUM_TYPE_EXTENSION,
   [Kind.INPUT_OBJECT_TYPE_DEFINITION]: Kind.INPUT_OBJECT_TYPE_EXTENSION,
 };
+
+// Transform an object's values via a callback function
+export function mapValues<T, U = T>(
+  object: Record<string, T>,
+  callback: (value: T) => U,
+): Record<string, U> {
+  const result: Record<string, U> = Object.create(null);
+
+  for (const [key, value] of Object.entries(object)) {
+    result[key] = callback(value);
+  }
+
+  return result;
+}
+
+export function isNotNullOrUndefined<T>(
+  value: T | null | undefined,
+): value is T {
+  return value !== null && typeof value !== 'undefined';
+}

packages/apollo-federation/src/composition/validate/preComposition/keyFieldsMissingExternal.ts

@@ -8,15 +8,14 @@ import {
   specifiedDirectives,
 } from 'graphql';
 import { buildSchemaFromSDL } from 'apollo-graphql';
-import { isNotNullOrUndefined } from 'apollo-env';
-
 import { federationDirectives } from '../../../directives';
 import { ServiceDefinition } from '../../types';
 import {
   findDirectivesOnTypeOrField,
   isStringValueNode,
   logServiceAndType,
   errorWithCode,
+  isNotNullOrUndefined
 } from '../../utils';
 
 /**

packages/apollo-federation/src/composition/validate/sdl/__tests__/matchingEnums.test.ts

@@ -8,7 +8,6 @@ import {
 } from 'graphql';
 import { validateSDL } from 'graphql/validation/validate';
 import gql from 'graphql-tag';
-
 import { composeServices, buildMapsFromServiceList } from '../../../compose';
 import {
   astSerializer,

packages/apollo-federation/src/composition/validate/sdl/__tests__/possibleTypeExtensions.test.ts

@@ -7,7 +7,6 @@ import {
 } from 'graphql';
 import { validateSDL } from 'graphql/validation/validate';
 import gql from 'graphql-tag';
-
 import { buildMapsFromServiceList } from '../../../compose';
 import {
   typeSerializer,

packages/apollo-federation/src/composition/validate/sdl/__tests__/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "extends": "../../../../../../../tsconfig.test.base",
+  "include": ["**/*"],
+  "references": [{ "path": "../../../../../" }]
+}

packages/apollo-federation/src/index.ts

@@ -1,2 +1,5 @@
+import "core-js/features/array/flat";
+import "core-js/features/array/flat-map";
+
 export * from './composition';
 export * from './service';

packages/apollo-federation/src/service/printFederatedSchema.ts

@@ -36,7 +36,6 @@ import {
   print,
   specifiedDirectives,
 } from 'graphql';
-
 import federationDirectives, { gatherDirectives } from '../directives';
 import { isFederationType } from '../types';
 

packages/apollo-federation/src/types.ts

@@ -37,7 +37,6 @@ export const AnyType = new GraphQLScalarType({
   },
 });
 
-// FIXME: move to apollo-env
 function isPromise<T>(value: PromiseOrValue<T>): value is Promise<T> {
   return Boolean(value && 'then' in value && typeof value.then === 'function');
 }

packages/apollo-federation/tsconfig.json

@@ -2,7 +2,8 @@
   "extends": "../../tsconfig.base",
   "compilerOptions": {
     "rootDir": "./src",
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "lib": ["es2017", "es2019.array", "esnext.asynciterable"],
   },
   "include": ["src/**/*"],
   "exclude": ["**/__tests__", "**/__mocks__"],

tsconfig.test.base.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.base",
   "compilerOptions": {
     "noEmit": true,
-    "lib": ["es2017", "esnext.asynciterable"],
+    "lib": ["es2017", "es2019.array", "esnext.asynciterable"],
     "types": ["node", "jest", "apollo-server-env/dist/global"],
     "paths": {
       "__mocks__/*" : ["__mocks__/*"],