@apollo/gateway 2.0.0-preview.8 → 2.0.0-preview.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "2.0.0-preview.8",
+  "version": "2.0.0-preview.9",
   "description": "Apollo Gateway",
   "author": "Apollo <packages@apollographql.com>",
   "main": "dist/index.js",
@@ -18,16 +18,16 @@
     "apollo"
   ],
   "engines": {
-    "node": ">=12.13.0 <17.0"
+    "node": ">=12.13.0 <18.0"
   },
   "license": "SEE LICENSE IN ./LICENSE",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@apollo/composition": "^2.0.0-preview.8",
+    "@apollo/composition": "^2.0.0-preview.9",
     "@apollo/core-schema": "^0.2.2",
-    "@apollo/query-planner": "^2.0.0-preview.8",
+    "@apollo/query-planner": "^2.0.0-preview.9",
     "@josephg/resolvable": "^1.0.1",
     "@opentelemetry/api": "^1.0.1",
     "@types/node-fetch": "2.6.1",
@@ -47,5 +47,5 @@
   "peerDependencies": {
     "graphql": "^16.0.0"
   },
-  "gitHead": "516a30d879b4bde5945adb55b80d0f64118c322f"
+  "gitHead": "dd5ea3a7675af3e19e82d8150f72fe217074ae02"
 }

package/src/__tests__/buildQueryPlan.test.ts

@@ -1,4 +1,7 @@
-import { astSerializer, queryPlanSerializer } from 'apollo-federation-integration-testsuite';
+import {
+  astSerializer,
+  queryPlanSerializer,
+} from 'apollo-federation-integration-testsuite';
 import { getFederatedTestingSchema } from './execution-utils';
 import { QueryPlan, QueryPlanner } from '@apollo/query-planner';
 import { Schema, parseOperation } from '@apollo/federation-internals';
@@ -6,14 +9,13 @@ import { Schema, parseOperation } from '@apollo/federation-internals';
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);
 
-
 describe('buildQueryPlan', () => {
   let schema: Schema;
   let queryPlanner: QueryPlanner;
 
   const buildPlan = (operation: string): QueryPlan => {
     return queryPlanner.buildQueryPlan(parseOperation(schema, operation));
-  }
+  };
 
   beforeEach(() => {
     expect(
@@ -515,7 +517,7 @@ describe('buildQueryPlan', () => {
 
   describe(`when requesting a composite field with subfields from another service`, () => {
     it(`should add key fields to the parent selection set and use a dependent fetch`, () => {
-       const operationString = `#graphql
+      const operationString = `#graphql
         query {
           topReviews {
             body
@@ -1171,4 +1173,49 @@ describe('buildQueryPlan', () => {
       `);
     });
   });
+
+  describe('overridden fields and type', () => {
+    it(`query plan of overridden field`, () => {
+      const operationString = `#graphql
+        query {
+          library (id: "3") {
+            name
+            description
+          }
+        }
+      `;
+
+      const queryPlan = buildPlan(operationString);
+      expect(queryPlan).toMatchInlineSnapshot(`
+        QueryPlan {
+          Sequence {
+            Fetch(service: "books") {
+              {
+                library(id: 3) {
+                  __typename
+                  id
+                  name
+                }
+              }
+            },
+            Flatten(path: "library") {
+              Fetch(service: "accounts") {
+                {
+                  ... on Library {
+                    __typename
+                    id
+                  }
+                } =>
+                {
+                  ... on Library {
+                    description
+                  }
+                }
+              },
+            },
+          },
+        }
+      `);
+    });
+  });
 });

package/src/__tests__/gateway/lifecycle-hooks.test.ts

@@ -147,7 +147,7 @@ describe('lifecycle hooks', () => {
     // the supergraph (even just formatting differences), this ID will change
     // and this test will have to updated.
     expect(secondCall[0]!.compositionId).toEqual(
-      'cf96012e98a17d3739f90afed59ef6a5d969d42a5780f9a069a790f2a959d711',
+      '730a2fe4036db8e2c847096ba2a62f78ff8f3c08c9ee092a5b1b37e1aa00ef5a',
     );
     // second call should have previous info in the second arg
     expect(secondCall[1]!.compositionId).toEqual(expectedFirstId);

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

@@ -91,12 +91,7 @@ const userService: ServiceDefinitionModule = {
         );
       },
       organization(user) {
-        return { id: user.organizationId };
-      },
-    },
-    Organization: {
-      __resolveObject(object) {
-        return organizations.find(org => org.id === object.id);
+        return organizations.find(org => org.id === user.organizationId);
       },
     },
   },

package/src/core/__tests__/core.test.ts

@@ -31,7 +31,7 @@ describe('core v0.1', () => {
 
       directive @tag(
         name: String!
-      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
+      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
       enum CacheControlScope {
         PRIVATE
@@ -87,7 +87,7 @@ describe('core v0.1', () => {
 
       directive @tag(
         name: String!
-      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
+      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
       enum CacheControlScope {
         PRIVATE
@@ -124,7 +124,7 @@ describe('core v0.2', () => {
       schema
         @core(feature: "https://specs.apollo.dev/core/v0.2")
         @core(feature: "https://specs.apollo.dev/join/v0.1", for: EXECUTION)
-        @core(feature: "https://specs.apollo.dev/tag/v0.1") {
+        @core(feature: "https://specs.apollo.dev/tag/v0.2") {
         query: Query
       }
 
@@ -151,7 +151,7 @@ describe('core v0.2', () => {
 
       directive @tag(
         name: String!
-      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
+      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
       enum CacheControlScope {
         PRIVATE
@@ -193,7 +193,7 @@ describe('core v0.2', () => {
       schema
         @core(feature: "https://specs.apollo.dev/core/v0.2")
         @core(feature: "https://specs.apollo.dev/join/v0.1", for: EXECUTION)
-        @core(feature: "https://specs.apollo.dev/tag/v0.1")
+        @core(feature: "https://specs.apollo.dev/tag/v0.2")
         @core(feature: "https://specs.apollo.dev/unsupported-feature/v0.1") {
         query: Query
       }
@@ -221,7 +221,7 @@ describe('core v0.2', () => {
 
       directive @tag(
         name: String!
-      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
+      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
       enum CacheControlScope {
         PRIVATE
@@ -293,7 +293,7 @@ describe('core v0.2', () => {
 
       directive @tag(
         name: String!
-      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
+      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
       enum CacheControlScope {
         PRIVATE
@@ -369,7 +369,7 @@ describe('core v0.2', () => {
 
       directive @tag(
         name: String!
-      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
+      ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
       enum CacheControlScope {
         PRIVATE