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

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 (61) hide show
  1. package/README.md +1 -1
  2. package/dist/__generated__/graphqlTypes.d.ts +13 -11
  3. package/dist/__generated__/graphqlTypes.d.ts.map +1 -1
  4. package/dist/__generated__/graphqlTypes.js.map +1 -1
  5. package/dist/config.d.ts +2 -9
  6. package/dist/config.d.ts.map +1 -1
  7. package/dist/config.js +6 -17
  8. package/dist/config.js.map +1 -1
  9. package/dist/datasources/types.d.ts +1 -1
  10. package/dist/datasources/types.d.ts.map +1 -1
  11. package/dist/executeQueryPlan.d.ts.map +1 -1
  12. package/dist/executeQueryPlan.js +4 -4
  13. package/dist/executeQueryPlan.js.map +1 -1
  14. package/dist/index.d.ts +1 -2
  15. package/dist/index.d.ts.map +1 -1
  16. package/dist/index.js +14 -28
  17. package/dist/index.js.map +1 -1
  18. package/dist/loadSupergraphSdlFromStorage.d.ts +4 -3
  19. package/dist/loadSupergraphSdlFromStorage.d.ts.map +1 -1
  20. package/dist/loadSupergraphSdlFromStorage.js +7 -3
  21. package/dist/loadSupergraphSdlFromStorage.js.map +1 -1
  22. package/dist/operationContext.js +0 -1
  23. package/dist/operationContext.js.map +1 -1
  24. package/dist/utilities/array.js +1 -1
  25. package/dist/utilities/array.js.map +1 -1
  26. package/package.json +8 -9
  27. package/src/__generated__/graphqlTypes.ts +13 -11
  28. package/src/__tests__/buildQueryPlan.test.ts +1 -1
  29. package/src/__tests__/executeQueryPlan.test.ts +572 -76
  30. package/src/__tests__/execution-utils.ts +2 -4
  31. package/src/__tests__/gateway/composedSdl.test.ts +1 -1
  32. package/src/__tests__/gateway/executor.test.ts +2 -0
  33. package/src/__tests__/gateway/lifecycle-hooks.test.ts +8 -4
  34. package/src/__tests__/gateway/opentelemetry.test.ts +1 -0
  35. package/src/__tests__/gateway/queryPlanCache.test.ts +3 -0
  36. package/src/__tests__/integration/aliases.test.ts +1 -0
  37. package/src/__tests__/integration/configuration.test.ts +3 -21
  38. package/src/__tests__/integration/logger.test.ts +1 -1
  39. package/src/__tests__/integration/networkRequests.test.ts +53 -28
  40. package/src/__tests__/integration/nockMocks.ts +33 -5
  41. package/src/__tests__/loadServicesFromRemoteEndpoint.test.ts +2 -2
  42. package/src/__tests__/loadSupergraphSdlFromStorage.test.ts +36 -6
  43. package/src/config.ts +8 -43
  44. package/src/core/__tests__/core.test.ts +6 -6
  45. package/src/datasources/types.ts +1 -1
  46. package/src/executeQueryPlan.ts +4 -7
  47. package/src/index.ts +22 -50
  48. package/src/loadServicesFromRemoteEndpoint.ts +1 -1
  49. package/src/loadSupergraphSdlFromStorage.ts +7 -4
  50. package/src/make-fetch-happen.d.ts +1 -1
  51. package/src/operationContext.ts +2 -2
  52. package/src/utilities/__tests__/cleanErrorOfInaccessibleElements.test.ts +1 -1
  53. package/src/utilities/array.ts +1 -1
  54. package/CHANGELOG.md +0 -452
  55. package/dist/legacyLoadServicesFromStorage.d.ts +0 -20
  56. package/dist/legacyLoadServicesFromStorage.d.ts.map +0 -1
  57. package/dist/legacyLoadServicesFromStorage.js +0 -62
  58. package/dist/legacyLoadServicesFromStorage.js.map +0 -1
  59. package/src/__tests__/integration/legacyNetworkRequests.test.ts +0 -279
  60. package/src/__tests__/integration/legacyNockMocks.ts +0 -113
  61. package/src/legacyLoadServicesFromStorage.ts +0 -170
@@ -4,8 +4,8 @@ exports.loadSupergraphSdlFromStorage = exports.SUPERGRAPH_SDL_QUERY = void 0;
4
4
  const apollo_server_env_1 = require("apollo-server-env");
5
5
  const outOfBandReporter_1 = require("./outOfBandReporter");
6
6
  exports.SUPERGRAPH_SDL_QUERY = `#graphql
7
- query SupergraphSdl($apiKey: String!, $ref: String!) {
8
- routerConfig(ref: $ref, apiKey: $apiKey) {
7
+ query SupergraphSdl($apiKey: String!, $ref: String!, $ifAfterId: ID) {
8
+ routerConfig(ref: $ref, apiKey: $apiKey, ifAfterId: $ifAfterId) {
9
9
  __typename
10
10
  ... on RouterConfigResult {
11
11
  id
@@ -20,7 +20,7 @@ exports.SUPERGRAPH_SDL_QUERY = `#graphql
20
20
  `;
21
21
  const { name, version } = require('../package.json');
22
22
  const fetchErrorMsg = "An error occurred while fetching your schema from Apollo: ";
23
- async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetcher, }) {
23
+ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetcher, compositionId, }) {
24
24
  var _a, _b;
25
25
  let result;
26
26
  const requestDetails = {
@@ -30,6 +30,7 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetche
30
30
  variables: {
31
31
  ref: graphRef,
32
32
  apiKey,
33
+ ifAfterId: compositionId,
33
34
  },
34
35
  }),
35
36
  headers: {
@@ -89,6 +90,9 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetche
89
90
  const { code, message } = routerConfig;
90
91
  throw new Error(`${code}: ${message}`);
91
92
  }
93
+ else if (routerConfig.__typename === 'Unchanged') {
94
+ return null;
95
+ }
92
96
  else {
93
97
  throw new Error('Programming error: unhandled response failure');
94
98
  }
@@ -1 +1 @@
1
- {"version":3,"file":"loadSupergraphSdlFromStorage.js","sourceRoot":"","sources":["../src/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loadSupergraphSdlFromStorage.js","sourceRoot":"","sources":["../src/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.buildOperationContext = void 0;
4
4
  const graphql_1 = require("graphql");
5
- ;
6
5
  function buildOperationContext({ schema, operationDocument, operationName, }) {
7
6
  let operation;
8
7
  let operationCount = 0;
@@ -1 +1 @@
1
- {"version":3,"file":"operationContext.js","sourceRoot":"","sources":["../src/operationContext.ts"],"names":[],"mappings":";;;AAAA,qCAOiB;AAehB,CAAC;AAEF,SAAgB,qBAAqB,CAAC,EACpC,MAAM,EACN,iBAAiB,EACjB,aAAa,GACgB;IAC7B,IAAI,SAA8C,CAAC;IACnD,IAAI,cAAc,GAAW,CAAC,CAAC;IAC/B,MAAM,SAAS,GAEX,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxB,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACjD,QAAQ,UAAU,CAAC,IAAI,EAAE;YACvB,KAAK,cAAI,CAAC,oBAAoB;gBAC5B,cAAc,EAAE,CAAC;gBACjB,IAAI,CAAC,aAAa,IAAI,cAAc,GAAG,CAAC,EAAE;oBACxC,MAAM,IAAI,sBAAY,CACpB,gDAAgD;wBAC9C,sBAAsB,CACzB,CAAC;iBACH;gBACD,IACE,CAAC,aAAa;oBACd,CAAC,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,KAAK,aAAa,CAAC,EAC5D;oBACA,SAAS,GAAG,UAAU,CAAC;iBACxB;gBACD,MAAM;YACR,KAAK,cAAI,CAAC,mBAAmB;gBAC3B,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;gBAC9C,MAAM;SACT;IACH,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,EAAE;QACd,IAAI,aAAa,EAAE;YACjB,MAAM,IAAI,sBAAY,CAAC,4BAA4B,aAAa,IAAI,CAAC,CAAC;SACvE;aAAM;YACL,MAAM,IAAI,sBAAY,CAAC,4BAA4B,CAAC,CAAC;SACtD;KACF;IAED,OAAO;QACL,MAAM;QACN,SAAS;QACT,SAAS;KACV,CAAC;AACJ,CAAC;AA7CD,sDA6CC"}
1
+ {"version":3,"file":"operationContext.js","sourceRoot":"","sources":["../src/operationContext.ts"],"names":[],"mappings":";;;AAAA,qCAOiB;AAiBjB,SAAgB,qBAAqB,CAAC,EACpC,MAAM,EACN,iBAAiB,EACjB,aAAa,GACgB;IAC7B,IAAI,SAA8C,CAAC;IACnD,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,MAAM,SAAS,GAEX,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxB,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACjD,QAAQ,UAAU,CAAC,IAAI,EAAE;YACvB,KAAK,cAAI,CAAC,oBAAoB;gBAC5B,cAAc,EAAE,CAAC;gBACjB,IAAI,CAAC,aAAa,IAAI,cAAc,GAAG,CAAC,EAAE;oBACxC,MAAM,IAAI,sBAAY,CACpB,gDAAgD;wBAC9C,sBAAsB,CACzB,CAAC;iBACH;gBACD,IACE,CAAC,aAAa;oBACd,CAAC,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,KAAK,aAAa,CAAC,EAC5D;oBACA,SAAS,GAAG,UAAU,CAAC;iBACxB;gBACD,MAAM;YACR,KAAK,cAAI,CAAC,mBAAmB;gBAC3B,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;gBAC9C,MAAM;SACT;IACH,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,EAAE;QACd,IAAI,aAAa,EAAE;YACjB,MAAM,IAAI,sBAAY,CAAC,4BAA4B,aAAa,IAAI,CAAC,CAAC;SACvE;aAAM;YACL,MAAM,IAAI,sBAAY,CAAC,4BAA4B,CAAC,CAAC;SACtD;KACF;IAED,OAAO;QACL,MAAM;QACN,SAAS;QACT,SAAS;KACV,CAAC;AACJ,CAAC;AA7CD,sDA6CC"}
@@ -19,7 +19,7 @@ function findAndExtract(array, predicate) {
19
19
  const index = array.findIndex(predicate);
20
20
  if (index === -1)
21
21
  return [undefined, array];
22
- let remaining = array.slice(0, index);
22
+ const remaining = array.slice(0, index);
23
23
  if (index < array.length - 1) {
24
24
  remaining.push(...array.slice(index + 1));
25
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"array.js","sourceRoot":"","sources":["../../src/utilities/array.ts"],"names":[],"mappings":";;;AAAA,SAAgB,oBAAoB,CAClC,KAA2B;IAE3B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,CAAC;AACxD,CAAC;AAJD,oDAIC;AAED,SAAgB,UAAU,CACxB,KAAU,EACV,UAAyE;IAEzE,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,oBAAoB,CAAC,MAAM,CAAC,EAAE;YAChC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1B;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,EACD,EAAS,CACV,CAAC;AACJ,CAAC;AAdD,gCAcC;AAED,SAAgB,cAAc,CAC5B,KAAU,EACV,SAA6D;IAE7D,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,KAAK,KAAK,CAAC,CAAC;QAAE,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAE5C,IAAI,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACtC,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC;AAbD,wCAaC;AAED,SAAgB,OAAO,CAAO,WAA8B;IAC1D,OAAO,CAAC,QAAqB,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;QAEjC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YACjC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAE9B,IAAI,KAAK,EAAE;gBACT,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACrB;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;aAC5B;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAjBD,0BAiBC"}
1
+ {"version":3,"file":"array.js","sourceRoot":"","sources":["../../src/utilities/array.ts"],"names":[],"mappings":";;;AAAA,SAAgB,oBAAoB,CAClC,KAA2B;IAE3B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,CAAC;AACxD,CAAC;AAJD,oDAIC;AAED,SAAgB,UAAU,CACxB,KAAU,EACV,UAAyE;IAEzE,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,oBAAoB,CAAC,MAAM,CAAC,EAAE;YAChC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1B;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,EACD,EAAS,CACV,CAAC;AACJ,CAAC;AAdD,gCAcC;AAED,SAAgB,cAAc,CAC5B,KAAU,EACV,SAA6D;IAE7D,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,KAAK,KAAK,CAAC,CAAC;QAAE,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAE5C,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACxC,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC;AAbD,wCAaC;AAED,SAAgB,OAAO,CAAO,WAA8B;IAC1D,OAAO,CAAC,QAAqB,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;QAEjC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YACjC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAE9B,IAAI,KAAK,EAAE;gBACT,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACrB;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;aAC5B;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAjBD,0BAiBC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@apollo/gateway",
3
- "version": "2.0.0-alpha.1",
3
+ "version": "2.0.0-alpha.2",
4
4
  "description": "Apollo Gateway",
5
5
  "author": "Apollo <packages@apollographql.com>",
6
6
  "main": "dist/index.js",
@@ -25,13 +25,12 @@
25
25
  "access": "public"
26
26
  },
27
27
  "dependencies": {
28
- "@apollo/composition": "^2.0.0-alpha.1",
29
- "@apollo/core-schema": "^0.1.0",
30
- "@apollo/federation": "^2.0.0-alpha.1",
31
- "@apollo/query-planner": "^2.0.0-alpha.1",
28
+ "@apollo/composition": "^2.0.0-alpha.2",
29
+ "@apollo/core-schema": "^0.2.0",
30
+ "@apollo/query-planner": "^2.0.0-alpha.2",
32
31
  "@opentelemetry/api": "^1.0.1",
33
32
  "@types/node-fetch": "2.5.12",
34
- "apollo-graphql": "^0.9.3",
33
+ "apollo-graphql": "^0.9.5",
35
34
  "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
36
35
  "apollo-server-caching": "^0.7.0 || ^3.0.0",
37
36
  "apollo-server-core": "^2.23.0 || ^3.0.0",
@@ -41,10 +40,10 @@
41
40
  "apollo-utilities": "^1.3.0",
42
41
  "loglevel": "^1.6.1",
43
42
  "make-fetch-happen": "^8.0.0",
44
- "pretty-format": "^26.0.0"
43
+ "pretty-format": "^27.0.0"
45
44
  },
46
45
  "peerDependencies": {
47
- "graphql": "^15.5.3"
46
+ "graphql": "^15.7.0"
48
47
  },
49
- "gitHead": "5f7184829607024343fb8b8ad0ac4e122407cd3a"
48
+ "gitHead": "9265ba09ec5620b931861a44603d7d5f7d4688f2"
50
49
  }
@@ -1,4 +1,5 @@
1
1
  export type Maybe<T> = T | null;
2
+ export type InputMaybe<T> = Maybe<T>;
2
3
  export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
3
4
  export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
4
5
  export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
@@ -17,15 +18,15 @@ export type ApiMonitoringReport = {
17
18
  endedAt: Scalars['Timestamp'];
18
19
  error: Error;
19
20
  request: Request;
20
- response?: Maybe<Response>;
21
+ response?: InputMaybe<Response>;
21
22
  startedAt: Scalars['Timestamp'];
22
23
  /** Tags can include things like version and package name */
23
- tags?: Maybe<Array<Scalars['String']>>;
24
+ tags?: InputMaybe<Array<Scalars['String']>>;
24
25
  };
25
26
 
26
27
  export type Error = {
27
28
  code: ErrorCode;
28
- message?: Maybe<Scalars['String']>;
29
+ message?: InputMaybe<Scalars['String']>;
29
30
  };
30
31
 
31
32
  export enum ErrorCode {
@@ -55,7 +56,7 @@ export enum FetchErrorCode {
55
56
 
56
57
  export type HttpHeader = {
57
58
  name: Scalars['String'];
58
- value?: Maybe<Scalars['String']>;
59
+ value?: InputMaybe<Scalars['String']>;
59
60
  };
60
61
 
61
62
  export type Message = {
@@ -77,7 +78,7 @@ export type Mutation = {
77
78
 
78
79
 
79
80
  export type MutationReportErrorArgs = {
80
- report?: Maybe<ApiMonitoringReport>;
81
+ report?: InputMaybe<ApiMonitoringReport>;
81
82
  };
82
83
 
83
84
  export type Query = {
@@ -90,19 +91,19 @@ export type Query = {
90
91
 
91
92
  export type QueryRouterConfigArgs = {
92
93
  apiKey: Scalars['String'];
94
+ ifAfterId?: InputMaybe<Scalars['ID']>;
93
95
  ref: Scalars['String'];
94
- unlessIdIn?: Maybe<Array<Scalars['ID']>>;
95
96
  };
96
97
 
97
98
  export type Request = {
98
- body?: Maybe<Scalars['String']>;
99
- headers?: Maybe<Array<HttpHeader>>;
99
+ body?: InputMaybe<Scalars['String']>;
100
+ headers?: InputMaybe<Array<HttpHeader>>;
100
101
  url: Scalars['String'];
101
102
  };
102
103
 
103
104
  export type Response = {
104
- body?: Maybe<Scalars['String']>;
105
- headers?: Maybe<Array<HttpHeader>>;
105
+ body?: InputMaybe<Scalars['String']>;
106
+ headers?: InputMaybe<Array<HttpHeader>>;
106
107
  httpStatusCode: Scalars['Int'];
107
108
  };
108
109
 
@@ -125,13 +126,14 @@ export type Unchanged = {
125
126
  export type SupergraphSdlQueryVariables = Exact<{
126
127
  apiKey: Scalars['String'];
127
128
  ref: Scalars['String'];
129
+ ifAfterId?: InputMaybe<Scalars['ID']>;
128
130
  }>;
129
131
 
130
132
 
131
133
  export type SupergraphSdlQuery = { __typename?: 'Query', routerConfig: { __typename: 'FetchError', code: FetchErrorCode, message: string } | { __typename: 'RouterConfigResult', id: string, supergraphSdl: string } | { __typename: 'Unchanged' } };
132
134
 
133
135
  export type OobReportMutationVariables = Exact<{
134
- input?: Maybe<ApiMonitoringReport>;
136
+ input?: InputMaybe<ApiMonitoringReport>;
135
137
  }>;
136
138
 
137
139
 
@@ -11,7 +11,7 @@ describe('buildQueryPlan', () => {
11
11
  let schema: Schema;
12
12
  let queryPlanner: QueryPlanner;
13
13
 
14
- let buildPlan = (operation: string): QueryPlan => {
14
+ const buildPlan = (operation: string): QueryPlan => {
15
15
  return queryPlanner.buildQueryPlan(parseOperation(schema, operation));
16
16
  }
17
17