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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/package.json +5 -5
  2. package/src/__tests__/buildQueryPlan.test.ts +51 -4
  3. package/src/__tests__/gateway/lifecycle-hooks.test.ts +1 -1
  4. package/src/__tests__/gateway/reporting.test.ts +5 -0
  5. package/src/__tests__/integration/complex-key.test.ts +1 -6
  6. package/src/core/__tests__/core.test.ts +8 -8
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@apollo/gateway",
3
- "version": "2.0.0-preview.5",
3
+ "version": "2.0.0-preview.9",
4
4
  "description": "Apollo Gateway",
5
5
  "author": "Apollo <packages@apollographql.com>",
6
6
  "main": "dist/index.js",
@@ -18,16 +18,16 @@
18
18
  "apollo"
19
19
  ],
20
20
  "engines": {
21
- "node": ">=12.13.0 <17.0"
21
+ "node": ">=12.13.0 <18.0"
22
22
  },
23
23
  "license": "SEE LICENSE IN ./LICENSE",
24
24
  "publishConfig": {
25
25
  "access": "public"
26
26
  },
27
27
  "dependencies": {
28
- "@apollo/composition": "^2.0.0-preview.5",
28
+ "@apollo/composition": "^2.0.0-preview.9",
29
29
  "@apollo/core-schema": "^0.2.2",
30
- "@apollo/query-planner": "^2.0.0-preview.5",
30
+ "@apollo/query-planner": "^2.0.0-preview.9",
31
31
  "@josephg/resolvable": "^1.0.1",
32
32
  "@opentelemetry/api": "^1.0.1",
33
33
  "@types/node-fetch": "2.6.1",
@@ -47,5 +47,5 @@
47
47
  "peerDependencies": {
48
48
  "graphql": "^16.0.0"
49
49
  },
50
- "gitHead": "3baf9497767a263e66f6a5c1123d9dd68fb63433"
50
+ "gitHead": "dd5ea3a7675af3e19e82d8150f72fe217074ae02"
51
51
  }
package/src/__tests__/buildQueryPlan.test.ts CHANGED
@@ -1,4 +1,7 @@
1
- import { astSerializer, queryPlanSerializer } from 'apollo-federation-integration-testsuite';
1
+ import {
2
+ astSerializer,
3
+ queryPlanSerializer,
4
+ } from 'apollo-federation-integration-testsuite';
2
5
  import { getFederatedTestingSchema } from './execution-utils';
3
6
  import { QueryPlan, QueryPlanner } from '@apollo/query-planner';
4
7
  import { Schema, parseOperation } from '@apollo/federation-internals';
@@ -6,14 +9,13 @@ import { Schema, parseOperation } from '@apollo/federation-internals';
6
9
  expect.addSnapshotSerializer(astSerializer);
7
10
  expect.addSnapshotSerializer(queryPlanSerializer);
8
11
 
9
-
10
12
  describe('buildQueryPlan', () => {
11
13
  let schema: Schema;
12
14
  let queryPlanner: QueryPlanner;
13
15
 
14
16
  const buildPlan = (operation: string): QueryPlan => {
15
17
  return queryPlanner.buildQueryPlan(parseOperation(schema, operation));
16
- }
18
+ };
17
19
 
18
20
  beforeEach(() => {
19
21
  expect(
@@ -515,7 +517,7 @@ describe('buildQueryPlan', () => {
515
517
 
516
518
  describe(`when requesting a composite field with subfields from another service`, () => {
517
519
  it(`should add key fields to the parent selection set and use a dependent fetch`, () => {
518
- const operationString = `#graphql
520
+ const operationString = `#graphql
519
521
  query {
520
522
  topReviews {
521
523
  body
@@ -1171,4 +1173,49 @@ describe('buildQueryPlan', () => {
1171
1173
  `);
1172
1174
  });
1173
1175
  });
1176
+
1177
+ describe('overridden fields and type', () => {
1178
+ it(`query plan of overridden field`, () => {
1179
+ const operationString = `#graphql
1180
+ query {
1181
+ library (id: "3") {
1182
+ name
1183
+ description
1184
+ }
1185
+ }
1186
+ `;
1187
+
1188
+ const queryPlan = buildPlan(operationString);
1189
+ expect(queryPlan).toMatchInlineSnapshot(`
1190
+ QueryPlan {
1191
+ Sequence {
1192
+ Fetch(service: "books") {
1193
+ {
1194
+ library(id: 3) {
1195
+ __typename
1196
+ id
1197
+ name
1198
+ }
1199
+ }
1200
+ },
1201
+ Flatten(path: "library") {
1202
+ Fetch(service: "accounts") {
1203
+ {
1204
+ ... on Library {
1205
+ __typename
1206
+ id
1207
+ }
1208
+ } =>
1209
+ {
1210
+ ... on Library {
1211
+ description
1212
+ }
1213
+ }
1214
+ },
1215
+ },
1216
+ },
1217
+ }
1218
+ `);
1219
+ });
1220
+ });
1174
1221
  });
package/src/__tests__/gateway/lifecycle-hooks.test.ts CHANGED
@@ -147,7 +147,7 @@ describe('lifecycle hooks', () => {
147
147
  // the supergraph (even just formatting differences), this ID will change
148
148
  // and this test will have to updated.
149
149
  expect(secondCall[0]!.compositionId).toEqual(
150
- 'be41610508728662796c2ccd71348603250b79a7f9854914ebfc771ac4ebcffb',
150
+ '730a2fe4036db8e2c847096ba2a62f78ff8f3c08c9ee092a5b1b37e1aa00ef5a',
151
151
  );
152
152
  // second call should have previous info in the second arg
153
153
  expect(secondCall[1]!.compositionId).toEqual(expectedFirstId);
package/src/__tests__/gateway/reporting.test.ts CHANGED
@@ -229,6 +229,7 @@ describe('reporting', () => {
229
229
  "seconds": "1562203363",
230
230
  },
231
231
  "header": "<HEADER>",
232
+ "operationCount": 1,
232
233
  "tracesPerQuery": Object {
233
234
  "# -
234
235
  {me{name{first last}}topProducts{name}}": Object {
@@ -301,6 +302,7 @@ describe('reporting', () => {
301
302
  "nanos": 123000000,
302
303
  "seconds": "1562203363",
303
304
  },
305
+ "fieldExecutionWeight": 1,
304
306
  "root": Object {
305
307
  "child": Array [
306
308
  Object {
@@ -366,6 +368,7 @@ describe('reporting', () => {
366
368
  "nanos": 123000000,
367
369
  "seconds": "1562203363",
368
370
  },
371
+ "fieldExecutionWeight": 1,
369
372
  "root": Object {
370
373
  "child": Array [
371
374
  Object {
@@ -467,6 +470,7 @@ describe('reporting', () => {
467
470
  "nanos": 123000000,
468
471
  "seconds": "1562203363",
469
472
  },
473
+ "fieldExecutionWeight": 1,
470
474
  "root": Object {
471
475
  "child": Array [
472
476
  Object {
@@ -556,6 +560,7 @@ describe('reporting', () => {
556
560
  "nanos": 123000000,
557
561
  "seconds": "1562203363",
558
562
  },
563
+ "fieldExecutionWeight": 1,
559
564
  "root": Object {
560
565
  "child": Array [
561
566
  Object {
package/src/__tests__/integration/complex-key.test.ts CHANGED
@@ -91,12 +91,7 @@ const userService: ServiceDefinitionModule = {
91
91
  );
92
92
  },
93
93
  organization(user) {
94
- return { id: user.organizationId };
95
- },
96
- },
97
- Organization: {
98
- __resolveObject(object) {
99
- return organizations.find(org => org.id === object.id);
94
+ return organizations.find(org => org.id === user.organizationId);
100
95
  },
101
96
  },
102
97
  },
package/src/core/__tests__/core.test.ts CHANGED
@@ -31,7 +31,7 @@ describe('core v0.1', () => {
31
31
 
32
32
  directive @tag(
33
33
  name: String!
34
- ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
34
+ ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
35
35
 
36
36
  enum CacheControlScope {
37
37
  PRIVATE
@@ -87,7 +87,7 @@ describe('core v0.1', () => {
87
87
 
88
88
  directive @tag(
89
89
  name: String!
90
- ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
90
+ ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
91
91
 
92
92
  enum CacheControlScope {
93
93
  PRIVATE
@@ -124,7 +124,7 @@ describe('core v0.2', () => {
124
124
  schema
125
125
  @core(feature: "https://specs.apollo.dev/core/v0.2")
126
126
  @core(feature: "https://specs.apollo.dev/join/v0.1", for: EXECUTION)
127
- @core(feature: "https://specs.apollo.dev/tag/v0.1") {
127
+ @core(feature: "https://specs.apollo.dev/tag/v0.2") {
128
128
  query: Query
129
129
  }
130
130
 
@@ -151,7 +151,7 @@ describe('core v0.2', () => {
151
151
 
152
152
  directive @tag(
153
153
  name: String!
154
- ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
154
+ ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
155
155
 
156
156
  enum CacheControlScope {
157
157
  PRIVATE
@@ -193,7 +193,7 @@ describe('core v0.2', () => {
193
193
  schema
194
194
  @core(feature: "https://specs.apollo.dev/core/v0.2")
195
195
  @core(feature: "https://specs.apollo.dev/join/v0.1", for: EXECUTION)
196
- @core(feature: "https://specs.apollo.dev/tag/v0.1")
196
+ @core(feature: "https://specs.apollo.dev/tag/v0.2")
197
197
  @core(feature: "https://specs.apollo.dev/unsupported-feature/v0.1") {
198
198
  query: Query
199
199
  }
@@ -221,7 +221,7 @@ describe('core v0.2', () => {
221
221
 
222
222
  directive @tag(
223
223
  name: String!
224
- ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
224
+ ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
225
225
 
226
226
  enum CacheControlScope {
227
227
  PRIVATE
@@ -293,7 +293,7 @@ describe('core v0.2', () => {
293
293
 
294
294
  directive @tag(
295
295
  name: String!
296
- ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
296
+ ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
297
297
 
298
298
  enum CacheControlScope {
299
299
  PRIVATE
@@ -369,7 +369,7 @@ describe('core v0.2', () => {
369
369
 
370
370
  directive @tag(
371
371
  name: String!
372
- ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION
372
+ ) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
373
373
 
374
374
  enum CacheControlScope {
375
375
  PRIVATE