@apollo/gateway 0.300.0-alpha.2 → 2.0.0-alpha.2

package/src/__tests__/integration/custom-directives.test.ts

@@ -1,6 +1,9 @@
 import gql from 'graphql-tag';
 import { execute } from '../execution-utils';
-import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
+import {
+  astSerializer,
+  queryPlanSerializer,
+} from 'apollo-federation-integration-testsuite';
 import { fixtures } from 'apollo-federation-integration-testsuite';
 
 expect.addSnapshotSerializer(astSerializer);
@@ -16,7 +19,7 @@ describe('custom executable directives', () => {
       }
     `;
 
-    const { errors, queryPlan } = await execute( {
+    const { errors, queryPlan } = await execute({
       query,
     });
 
@@ -41,13 +44,16 @@ describe('custom executable directives', () => {
         topReviews {
           body @stream
           author @transform(from: "JSON") {
-            name @stream
+            name @stream {
+              first
+              last
+            }
           }
         }
       }
     `;
 
-    const { errors, queryPlan } = await execute( {
+    const { errors, queryPlan } = await execute({
       query,
     });
 
@@ -55,40 +61,46 @@ describe('custom executable directives', () => {
     expect(queryPlan).toCallService('reviews');
     expect(queryPlan).toCallService('accounts');
     expect(queryPlan).toMatchInlineSnapshot(`
-        QueryPlan {
-          Sequence {
-            Fetch(service: "reviews") {
-              {
-                topReviews {
-                  body @stream
-                  author @transform(from: "JSON") {
-                    __typename
-                    id
-                  }
+      QueryPlan {
+        Sequence {
+          Fetch(service: "reviews") {
+            {
+              topReviews {
+                body @stream
+                author @transform(from: "JSON") {
+                  __typename
+                  id
                 }
               }
-            },
-            Flatten(path: "topReviews.@.author") {
-              Fetch(service: "accounts") {
-                {
-                  ... on User {
-                    __typename
-                    id
-                  }
-                } =>
-                {
-                  ... on User {
-                    name @stream
+            }
+          },
+          Flatten(path: "topReviews.@.author") {
+            Fetch(service: "accounts") {
+              {
+                ... on User {
+                  __typename
+                  id
+                }
+              } =>
+              {
+                ... on User {
+                  name @stream {
+                    first
+                    last
                   }
                 }
-              },
+              }
             },
           },
-        }
-      `);
+        },
+      }
+    `);
   });
 
-  it("returns validation errors when directives aren't present across all services", async () => {
+  // With relaxed composition, instead of erroring out if a directive is not declared everywhere, we compose but don't
+  // include the directive in the supergraph and generate a hint. So the following test will complain that @stream 
+  // is unknown in the query. Not that the hints tests do test we properly raise an hint in that case.
+  it.skip("returns validation errors when directives aren't present across all services", async () => {
     const invalidService = {
       name: 'invalidService',
       typeDefs: gql`
@@ -112,15 +124,18 @@ describe('custom executable directives', () => {
         [...fixtures, invalidService],
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
-"[@stream] -> Custom directives must be implemented in every service. The following services do not implement the @stream directive: invalidService.
+      "[@invalid] -> Custom directives must be implemented in every service. The following services do not implement the @invalid directive: accounts, books, documents, inventory, product, reviews.
 
-[@transform] -> Custom directives must be implemented in every service. The following services do not implement the @transform directive: invalidService.
+      [@stream] -> Custom directives must be implemented in every service. The following services do not implement the @stream directive: invalidService.
 
-[@invalid] -> Custom directives must be implemented in every service. The following services do not implement the @invalid directive: accounts, books, documents, inventory, product, reviews."
-`);
+      [@transform] -> Custom directives must be implemented in every service. The following services do not implement the @transform directive: invalidService."
+    `);
   });
 
-  it("returns validation errors when directives aren't identical across all services", async () => {
+  // Same as previous: we don't of error out on inconsistent execution directives. Here, we instead look at the intersection of locations
+  // defined, and as that is empty, we don't include the directive in the supergraph (and raise a hint).
+  // So the following test will complain that @stream is unknown in the query. Not that the hints tests do test we properly raise an hint in that case.
+  it.skip("returns validation errors when directives aren't identical across all services", async () => {
     const invalidService = {
       name: 'invalid',
       typeDefs: gql`
@@ -144,16 +159,16 @@ describe('custom executable directives', () => {
         [...fixtures, invalidService],
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
-"[@transform] -> Custom directives must be implemented in every service. The following services do not implement the @transform directive: invalid.
-
-[@stream] -> custom directives must be defined identically across all services. See below for a list of current implementations:
-	accounts: directive @stream on FIELD
-	books: directive @stream on FIELD
-	documents: directive @stream on FIELD
-	inventory: directive @stream on FIELD
-	product: directive @stream on FIELD
-	reviews: directive @stream on FIELD
-	invalid: directive @stream on QUERY"
-`);
+      "[@transform] -> Custom directives must be implemented in every service. The following services do not implement the @transform directive: invalid.
+
+      [@stream] -> custom directives must be defined identically across all services. See below for a list of current implementations:
+      	accounts: directive @stream on FIELD
+      	books: directive @stream on FIELD
+      	documents: directive @stream on FIELD
+      	inventory: directive @stream on FIELD
+      	product: directive @stream on FIELD
+      	reviews: directive @stream on FIELD
+      	invalid: directive @stream on QUERY"
+    `);
   });
 });

package/src/__tests__/integration/fragments.test.ts

@@ -104,7 +104,10 @@ it('supports named fragments (one level)', async () => {
 it('supports multiple named fragments (one level, mixed ordering)', async () => {
   const query = `#graphql
     fragment userInfo on User {
-      name
+      name {
+        first
+        last
+      }
     }
     query GetUser {
       me {
@@ -125,7 +128,10 @@ it('supports multiple named fragments (one level, mixed ordering)', async () =>
   expect(data).toEqual({
     me: {
       username: '@ada',
-      name: 'Ada Lovelace',
+      name: {
+        first: 'Ada',
+        last: 'Lovelace',
+      }
     },
   });
 

package/src/__tests__/integration/list-key.test.ts

@@ -1,6 +1,6 @@
 import gql from 'graphql-tag';
 import { execute, ServiceDefinitionModule } from '../execution-utils';
-import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
+import { astSerializer, queryPlanSerializer } from 'apollo-federation-integration-testsuite';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);
@@ -49,7 +49,7 @@ const reviewService: ServiceDefinitionModule = {
 };
 
 const listsAreEqual = <T>(as: T[], bs: T[]) =>
-  as.length === bs.length && as.every((a, i) => bs[i] === as[i]);
+  as.length === bs.length && as.every((_, i) => bs[i] === as[i]);
 
 const userService: ServiceDefinitionModule = {
   name: 'user',

package/src/__tests__/integration/logger.test.ts

@@ -10,7 +10,7 @@ import * as log4js from "log4js";
 
 const LOWEST_LOG_LEVEL = "debug";
 
-const KNOWN_DEBUG_MESSAGE = "Checking service definitions...";
+const KNOWN_DEBUG_MESSAGE = "Checking for composition updates...";
 
 async function triggerKnownDebugMessage(logger: Logger) {
   // Trigger a known error.
@@ -18,7 +18,7 @@ async function triggerKnownDebugMessage(logger: Logger) {
   // message outside of the constructor, but it seemed worth testing
   // the compatibility with `ApolloGateway` itself rather than generically.
   // The error does not matter, so it is caught and ignored.
-  await new ApolloGateway({ logger }).load().catch(_e => {});
+  await new ApolloGateway({ logger }).load().catch(_e => undefined);
 }
 
 describe("logger", () => {

package/src/__tests__/integration/multiple-key.test.ts

@@ -1,6 +1,6 @@
 import gql from 'graphql-tag';
 import { execute, ServiceDefinitionModule } from '../execution-utils';
-import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
+import { astSerializer, queryPlanSerializer } from 'apollo-federation-integration-testsuite';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);
@@ -192,9 +192,8 @@ it('fetches data correctly with multiple @key fields', async () => {
             } =>
             {
               ... on User {
-                name
-                __typename
                 ssn
+                name
               }
             }
           },
@@ -283,40 +282,40 @@ it('fetches keys as needed to reduce round trip queries', async () => {
               {
                 users {
                   __typename
-                  ssn
                   id
+                  ssn
                 }
               }
             },
             Parallel {
               Flatten(path: "users.@") {
-                Fetch(service: "actuary") {
+                Fetch(service: "reviews") {
                   {
                     ... on User {
                       __typename
-                      ssn
+                      id
                     }
                   } =>
                   {
                     ... on User {
-                      risk
+                      reviews {
+                        body
+                      }
                     }
                   }
                 },
               },
               Flatten(path: "users.@") {
-                Fetch(service: "reviews") {
+                Fetch(service: "actuary") {
                   {
                     ... on User {
                       __typename
-                      id
+                      ssn
                     }
                   } =>
                   {
                     ... on User {
-                      reviews {
-                        body
-                      }
+                      risk
                     }
                   }
                 },

package/src/__tests__/integration/mutations.test.ts

@@ -1,5 +1,8 @@
 import { execute } from '../execution-utils';
-import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
+import {
+  astSerializer,
+  queryPlanSerializer,
+} from 'apollo-federation-integration-testsuite';
 import { accounts, reviews } from 'apollo-federation-integration-testsuite';
 
 expect.addSnapshotSerializer(astSerializer);
@@ -47,7 +50,7 @@ it('supports mutations', async () => {
 it('returning across service boundaries', async () => {
   const query = `#graphql
     mutation Review($upc: String!, $body: String!) {
-      reviewProduct(upc: $upc, body: $body) {
+      reviewProduct(input: { upc: $upc, body: $body }) {
         ... on Furniture {
           name
         }
@@ -92,7 +95,7 @@ it('multiple root mutations', async () => {
           }
         }
       }
-      reviewProduct(upc: $upc, body: $body) {
+      reviewProduct(input: { upc: $upc, body: $body }) {
         ... on Furniture {
           name
         }
@@ -148,7 +151,7 @@ it('multiple root mutations with correct service order', async () => {
       $password: String!
       $reviewId: ID!
     ) {
-      reviewProduct(upc: $upc, body: $body) {
+      reviewProduct(input: { upc: $upc, body: $body }) {
         ... on Furniture {
           upc
         }
@@ -208,7 +211,7 @@ it('multiple root mutations with correct service order', async () => {
       Sequence {
         Fetch(service: "reviews") {
           {
-            reviewProduct(upc: $upc, body: $body) {
+            reviewProduct(input: {upc: $upc, body: $body}) {
               __typename
               ... on Furniture {
                 upc