From d424db8a12cf592ea16871a97d5d137740afe487 Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Thu, 15 Feb 2024 23:08:04 +0100 Subject: [PATCH 01/13] failing test --- packages/federation/test/queries.test.ts | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 packages/federation/test/queries.test.ts diff --git a/packages/federation/test/queries.test.ts b/packages/federation/test/queries.test.ts new file mode 100644 index 00000000000..0236a48344c --- /dev/null +++ b/packages/federation/test/queries.test.ts @@ -0,0 +1,50 @@ +import { readFileSync } from 'fs'; +import { join } from 'path'; +import { parse, print } from 'graphql'; +import { execute } from '@graphql-tools/executor'; +import { getStitchedSchemaFromSupergraphSdl } from '../src/supergraph'; + +it('should not do a fragment spread on a union', () => { + let query = ''; + + const schema = getStitchedSchemaFromSupergraphSdl({ + supergraphSdl: readFileSync(join(__dirname, 'fixtures', 'supergraphs', 'c.graphql'), 'utf8'), + onExecutor() { + return function executor(request) { + query = print(request.document); + return {}; + }; + }, + }); + + execute({ + schema, + document: parse(/* GraphQL */ ` + { + fooBar { + ... on Foo { + name + } + ... on Bar { + name + } + } + } + `), + }); + + expect(query).toMatchInlineSnapshot(` +"{ + __typename + fooBar { + ... on Foo { + name + } + ... on Bar { + name + } + __typename + } +}" +`); +}); From 0cc48337cd92f7c1e855f02b6bbbe8837f1c8635 Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Mon, 19 Feb 2024 12:42:46 +0100 Subject: [PATCH 02/13] nospread lol --- packages/delegate/src/prepareGatewayDocument.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/delegate/src/prepareGatewayDocument.ts b/packages/delegate/src/prepareGatewayDocument.ts index c6cbb696952..7abe0ed7111 100644 --- a/packages/delegate/src/prepareGatewayDocument.ts +++ b/packages/delegate/src/prepareGatewayDocument.ts @@ -6,6 +6,7 @@ import { GraphQLNamedType, GraphQLOutputType, GraphQLSchema, + GraphQLUnionType, InlineFragmentNode, isAbstractType, isCompositeType, @@ -443,7 +444,11 @@ function wrapConcreteTypes( }, [Kind.FIELD]: (node: FieldNode) => { const type = typeInfo.getType(); - if (type != null && isAbstractType(getNamedType(type))) { + if ( + type != null && + isAbstractType(getNamedType(type)) && + (!(type instanceof GraphQLUnionType) || type.name === '_Entity') // unnecessary spread on union types, except for federation's "_Entity" (https://www.apollographql.com/docs/federation/subgraph-spec/#union-_entity) + ) { return { ...node, selectionSet: { From 6f9059f18b6529eb747edf5accfb2c148aeb6165 Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Mon, 19 Feb 2024 12:44:02 +0100 Subject: [PATCH 03/13] changset --- .changeset/swift-cows-tan.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/swift-cows-tan.md diff --git a/.changeset/swift-cows-tan.md b/.changeset/swift-cows-tan.md new file mode 100644 index 00000000000..e81e86b6e17 --- /dev/null +++ b/.changeset/swift-cows-tan.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/delegate": patch +--- + +No unnecessary inline fragment spreads for union types From 00749834a39b08aa3119a66d2a1c47d17656dbea Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Mon, 19 Feb 2024 13:05:34 +0100 Subject: [PATCH 04/13] use latest delegate tool --- packages/batch-delegate/package.json | 2 +- packages/federation/package.json | 2 +- packages/links/package.json | 2 +- packages/loaders/url/package.json | 2 +- packages/stitch/package.json | 2 +- packages/stitching-directives/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/batch-delegate/package.json b/packages/batch-delegate/package.json index 0aab63e68f7..bf10b98e6dd 100644 --- a/packages/batch-delegate/package.json +++ b/packages/batch-delegate/package.json @@ -50,7 +50,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.1", + "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/utils": "^10.0.0", "dataloader": "2.2.2", "tslib": "^2.4.0", diff --git a/packages/federation/package.json b/packages/federation/package.json index e6426fe6659..ee8ba80a713 100644 --- a/packages/federation/package.json +++ b/packages/federation/package.json @@ -50,7 +50,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.1", + "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/executor-http": "^1.0.6", "@graphql-tools/merge": "^9.0.0", "@graphql-tools/schema": "^10.0.0", diff --git a/packages/links/package.json b/packages/links/package.json index 8953690517f..a4c8202c0dc 100644 --- a/packages/links/package.json +++ b/packages/links/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.0", + "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/utils": "^10.0.0", "apollo-upload-client": "17.0.0", "form-data": "^4.0.0", diff --git a/packages/loaders/url/package.json b/packages/loaders/url/package.json index 857248baf24..b08fbe46035 100644 --- a/packages/loaders/url/package.json +++ b/packages/loaders/url/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@ardatan/sync-fetch": "^0.0.1", - "@graphql-tools/delegate": "^10.0.0", + "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/executor-graphql-ws": "^1.0.0", "@graphql-tools/executor-http": "^1.0.5", "@graphql-tools/executor-legacy-ws": "^1.0.0", diff --git a/packages/stitch/package.json b/packages/stitch/package.json index e67b6cfc8f3..26890267b4d 100644 --- a/packages/stitch/package.json +++ b/packages/stitch/package.json @@ -51,7 +51,7 @@ }, "dependencies": { "@graphql-tools/batch-delegate": "^9.0.0", - "@graphql-tools/delegate": "^10.0.1", + "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/executor": "^1.0.0", "@graphql-tools/merge": "^9.0.0", "@graphql-tools/schema": "^10.0.0", diff --git a/packages/stitching-directives/package.json b/packages/stitching-directives/package.json index a04551d971b..6908044464d 100644 --- a/packages/stitching-directives/package.json +++ b/packages/stitching-directives/package.json @@ -50,7 +50,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.0", + "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/utils": "^10.0.0", "tslib": "^2.4.0" }, From 4ed66a2c0077a30c9860ed9f0288efe28489da6f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 19 Feb 2024 12:06:05 +0000 Subject: [PATCH 05/13] chore(dependencies): updated changesets for modified dependencies --- .../@graphql-tools_batch-delegate-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_federation-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_links-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_stitch-5913-dependencies.md | 5 +++++ .../@graphql-tools_stitching-directives-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_url-loader-5913-dependencies.md | 5 +++++ 6 files changed, 30 insertions(+) create mode 100644 .changeset/@graphql-tools_batch-delegate-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_federation-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_links-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_stitch-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_stitching-directives-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_url-loader-5913-dependencies.md diff --git a/.changeset/@graphql-tools_batch-delegate-5913-dependencies.md b/.changeset/@graphql-tools_batch-delegate-5913-dependencies.md new file mode 100644 index 00000000000..d0df2465ddf --- /dev/null +++ b/.changeset/@graphql-tools_batch-delegate-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/batch-delegate": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.1`, in `dependencies`) diff --git a/.changeset/@graphql-tools_federation-5913-dependencies.md b/.changeset/@graphql-tools_federation-5913-dependencies.md new file mode 100644 index 00000000000..f7273c90a5f --- /dev/null +++ b/.changeset/@graphql-tools_federation-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/federation": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.1`, in `dependencies`) diff --git a/.changeset/@graphql-tools_links-5913-dependencies.md b/.changeset/@graphql-tools_links-5913-dependencies.md new file mode 100644 index 00000000000..e4b6e1193a0 --- /dev/null +++ b/.changeset/@graphql-tools_links-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/links": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_stitch-5913-dependencies.md b/.changeset/@graphql-tools_stitch-5913-dependencies.md new file mode 100644 index 00000000000..7b4ad48bc24 --- /dev/null +++ b/.changeset/@graphql-tools_stitch-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/stitch": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.1`, in `dependencies`) diff --git a/.changeset/@graphql-tools_stitching-directives-5913-dependencies.md b/.changeset/@graphql-tools_stitching-directives-5913-dependencies.md new file mode 100644 index 00000000000..66d0c4e0953 --- /dev/null +++ b/.changeset/@graphql-tools_stitching-directives-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/stitching-directives": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_url-loader-5913-dependencies.md b/.changeset/@graphql-tools_url-loader-5913-dependencies.md new file mode 100644 index 00000000000..806a9ad95e7 --- /dev/null +++ b/.changeset/@graphql-tools_url-loader-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/url-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.0`, in `dependencies`) From fe738fbf5bfcaa26783048424a1d1e4e62b1a72e Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Mon, 19 Feb 2024 13:14:08 +0100 Subject: [PATCH 06/13] because of different graphql print options, use toContain --- packages/federation/test/queries.test.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/federation/test/queries.test.ts b/packages/federation/test/queries.test.ts index 0236a48344c..3f1284befbb 100644 --- a/packages/federation/test/queries.test.ts +++ b/packages/federation/test/queries.test.ts @@ -33,8 +33,7 @@ it('should not do a fragment spread on a union', () => { `), }); - expect(query).toMatchInlineSnapshot(` -"{ + expect(query).toContain(`{ __typename fooBar { ... on Foo { @@ -45,6 +44,5 @@ it('should not do a fragment spread on a union', () => { } __typename } -}" -`); +}`); }); From 85dcedc2c092ca722e3a5bd6288e5dcec9f558a9 Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Thu, 22 Feb 2024 15:44:12 +0100 Subject: [PATCH 07/13] fragment spread on required --- .../__snapshots__/supergraphs.test.ts.snap | 2 ++ .../test/fixtures/supergraphs/c.graphql | 1 + packages/federation/test/queries.test.ts | 26 ++++++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/packages/federation/test/__snapshots__/supergraphs.test.ts.snap b/packages/federation/test/__snapshots__/supergraphs.test.ts.snap index 3073a573fd5..72b43609bb1 100644 --- a/packages/federation/test/__snapshots__/supergraphs.test.ts.snap +++ b/packages/federation/test/__snapshots__/supergraphs.test.ts.snap @@ -459,6 +459,7 @@ type Query { me: User throw: String fooBar: FooBar + mustFooBar: FooBar! } type User { @@ -488,6 +489,7 @@ type Query { me: User throw: String fooBar: FooBar + mustFooBar: FooBar! _entities(representations: [_Any!]!): _Entity } diff --git a/packages/federation/test/fixtures/supergraphs/c.graphql b/packages/federation/test/fixtures/supergraphs/c.graphql index 373c1c8b6f5..8306e27c030 100644 --- a/packages/federation/test/fixtures/supergraphs/c.graphql +++ b/packages/federation/test/fixtures/supergraphs/c.graphql @@ -64,6 +64,7 @@ type Query @join__type(graph: ACCOUNTS) { me: User throw: String fooBar: FooBar + mustFooBar: FooBar! } type User @join__type(graph: ACCOUNTS, key: "id") { diff --git a/packages/federation/test/queries.test.ts b/packages/federation/test/queries.test.ts index 3f1284befbb..6b5740648cf 100644 --- a/packages/federation/test/queries.test.ts +++ b/packages/federation/test/queries.test.ts @@ -5,13 +5,13 @@ import { execute } from '@graphql-tools/executor'; import { getStitchedSchemaFromSupergraphSdl } from '../src/supergraph'; it('should not do a fragment spread on a union', () => { - let query = ''; + const queries: string[] = []; const schema = getStitchedSchemaFromSupergraphSdl({ supergraphSdl: readFileSync(join(__dirname, 'fixtures', 'supergraphs', 'c.graphql'), 'utf8'), onExecutor() { return function executor(request) { - query = print(request.document); + queries.push(print(request.document)); return {}; }; }, @@ -29,11 +29,19 @@ it('should not do a fragment spread on a union', () => { name } } + mustFooBar { + ... on Foo { + name + } + ... on Bar { + name + } + } } `), }); - expect(query).toContain(`{ + expect(queries[0]).toContain(`{ __typename fooBar { ... on Foo { @@ -44,5 +52,17 @@ it('should not do a fragment spread on a union', () => { } __typename } +}`); + expect(queries[1]).toContain(`{ + __typename + mustFooBar { + ... on Foo { + name + } + ... on Bar { + name + } + __typename + } }`); }); From 7a2b31b701e0637dc843cbe2507699f0721c20da Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Thu, 22 Feb 2024 15:51:43 +0100 Subject: [PATCH 08/13] handle nonnullable types --- packages/delegate/src/prepareGatewayDocument.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/delegate/src/prepareGatewayDocument.ts b/packages/delegate/src/prepareGatewayDocument.ts index 7abe0ed7111..dbb7682ec9e 100644 --- a/packages/delegate/src/prepareGatewayDocument.ts +++ b/packages/delegate/src/prepareGatewayDocument.ts @@ -6,11 +6,12 @@ import { GraphQLNamedType, GraphQLOutputType, GraphQLSchema, - GraphQLUnionType, InlineFragmentNode, isAbstractType, isCompositeType, isInterfaceType, + isNonNullType, + isUnionType, Kind, SelectionNode, SelectionSetNode, @@ -443,11 +444,12 @@ function wrapConcreteTypes( } }, [Kind.FIELD]: (node: FieldNode) => { - const type = typeInfo.getType(); + let type = typeInfo.getType(); + type = isNonNullType(type) ? type.ofType : type; if ( type != null && isAbstractType(getNamedType(type)) && - (!(type instanceof GraphQLUnionType) || type.name === '_Entity') // unnecessary spread on union types, except for federation's "_Entity" (https://www.apollographql.com/docs/federation/subgraph-spec/#union-_entity) + (!isUnionType(type) || type.name === '_Entity') // unnecessary spread on union types, except for federation's "_Entity" (https://www.apollographql.com/docs/federation/subgraph-spec/#union-_entity) ) { return { ...node, From 588a0a7053721a8910f8818768c12460ad8cef49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 22 Feb 2024 14:52:27 +0000 Subject: [PATCH 09/13] chore(dependencies): updated changesets for modified dependencies --- .../@graphql-tools_code-file-loader-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_git-loader-5913-dependencies.md | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 .changeset/@graphql-tools_code-file-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_git-loader-5913-dependencies.md diff --git a/.changeset/@graphql-tools_code-file-loader-5913-dependencies.md b/.changeset/@graphql-tools_code-file-loader-5913-dependencies.md new file mode 100644 index 00000000000..64b3be9be0a --- /dev/null +++ b/.changeset/@graphql-tools_code-file-loader-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/code-file-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/graphql-tag-pluck@8.3.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/graphql-tag-pluck/v/8.3.0) (from `8.2.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_git-loader-5913-dependencies.md b/.changeset/@graphql-tools_git-loader-5913-dependencies.md new file mode 100644 index 00000000000..bf787f5c859 --- /dev/null +++ b/.changeset/@graphql-tools_git-loader-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/git-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/graphql-tag-pluck@8.3.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/graphql-tag-pluck/v/8.3.0) (from `8.2.0`, in `dependencies`) From e8fd67854ec5e1583f45592342bb77f07afbb869 Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Thu, 22 Feb 2024 16:36:03 +0100 Subject: [PATCH 10/13] link deps --- packages/batch-delegate/package.json | 6 +- packages/batch-execute/package.json | 2 +- packages/delegate/package.json | 4 +- .../delegate/src/prepareGatewayDocument.ts | 1 + packages/executor/package.json | 2 +- packages/executors/apollo-link/package.json | 2 +- packages/executors/envelop/package.json | 4 +- packages/executors/graphql-ws/package.json | 2 +- packages/executors/http/package.json | 2 +- packages/executors/legacy-ws/package.json | 2 +- packages/executors/urql-exchange/package.json | 2 +- packages/executors/yoga/package.json | 2 +- packages/federation/package.json | 12 +-- packages/federation/test/gateway.test.ts | 93 ++++++++++++------- packages/graphql-tools/package.json | 2 +- packages/import/package.json | 2 +- packages/links/package.json | 2 +- packages/load/package.json | 4 +- packages/loaders/apollo-engine/package.json | 2 +- packages/loaders/github/package.json | 4 +- packages/loaders/graphql-file/package.json | 2 +- packages/loaders/json-file/package.json | 2 +- packages/loaders/module/package.json | 2 +- packages/loaders/prisma/package.json | 2 +- packages/loaders/url/package.json | 6 +- packages/merge/package.json | 2 +- packages/mock/package.json | 2 +- packages/node-require/package.json | 2 +- .../relay-operation-optimizer/package.json | 2 +- packages/resolvers-composition/package.json | 2 +- packages/schema/package.json | 2 +- packages/stitch/package.json | 8 +- packages/stitching-directives/package.json | 4 +- packages/wrap/package.json | 4 +- 34 files changed, 108 insertions(+), 86 deletions(-) diff --git a/packages/batch-delegate/package.json b/packages/batch-delegate/package.json index bf10b98e6dd..bb0751b167f 100644 --- a/packages/batch-delegate/package.json +++ b/packages/batch-delegate/package.json @@ -51,14 +51,14 @@ }, "dependencies": { "@graphql-tools/delegate": "^10.0.3", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "dataloader": "2.2.2", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" }, "devDependencies": { - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/stitch": "9.0.4" + "@graphql-tools/schema": "^10.0.2", + "@graphql-tools/stitch": "^9.0.4" }, "publishConfig": { "directory": "dist", diff --git a/packages/batch-execute/package.json b/packages/batch-execute/package.json index c2571bc813f..fb7a68fbce6 100644 --- a/packages/batch-execute/package.json +++ b/packages/batch-execute/package.json @@ -50,7 +50,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.5", + "@graphql-tools/utils": "^10.0.13", "dataloader": "^2.2.2", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" diff --git a/packages/delegate/package.json b/packages/delegate/package.json index 4ef7ef63a0c..bfcef563cf3 100644 --- a/packages/delegate/package.json +++ b/packages/delegate/package.json @@ -52,8 +52,8 @@ "dependencies": { "@graphql-tools/batch-execute": "^9.0.1", "@graphql-tools/executor": "^1.0.0", - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/utils": "^10.0.5", + "@graphql-tools/schema": "^10.0.2", + "@graphql-tools/utils": "^10.0.13", "dataloader": "^2.2.2", "tslib": "^2.5.0" }, diff --git a/packages/delegate/src/prepareGatewayDocument.ts b/packages/delegate/src/prepareGatewayDocument.ts index dbb7682ec9e..7805db42400 100644 --- a/packages/delegate/src/prepareGatewayDocument.ts +++ b/packages/delegate/src/prepareGatewayDocument.ts @@ -446,6 +446,7 @@ function wrapConcreteTypes( [Kind.FIELD]: (node: FieldNode) => { let type = typeInfo.getType(); type = isNonNullType(type) ? type.ofType : type; + console.trace(); if ( type != null && isAbstractType(getNamedType(type)) && diff --git a/packages/executor/package.json b/packages/executor/package.json index 8b1a3640725..d86711cf094 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -55,7 +55,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.8", + "@graphql-tools/utils": "^10.0.13", "@graphql-typed-document-node/core": "3.2.0", "@repeaterjs/repeater": "^3.0.4", "tslib": "^2.4.0", diff --git a/packages/executors/apollo-link/package.json b/packages/executors/apollo-link/package.json index 16369a9a61d..f93998fb928 100644 --- a/packages/executors/apollo-link/package.json +++ b/packages/executors/apollo-link/package.json @@ -52,7 +52,7 @@ "graphql": "^15.2.0 || ^16.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.3.1" }, "devDependencies": { diff --git a/packages/executors/envelop/package.json b/packages/executors/envelop/package.json index b106d597db3..86e4fb45136 100644 --- a/packages/executors/envelop/package.json +++ b/packages/executors/envelop/package.json @@ -51,8 +51,8 @@ "@envelop/core": "^3.0.4 || ^4.0.0 || ^5.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.0", - "@graphql-tools/wrap": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", + "@graphql-tools/wrap": "^10.0.1", "tslib": "^2.3.1" }, "devDependencies": { diff --git a/packages/executors/graphql-ws/package.json b/packages/executors/graphql-ws/package.json index 14848145cda..8b182200751 100644 --- a/packages/executors/graphql-ws/package.json +++ b/packages/executors/graphql-ws/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.2", + "@graphql-tools/utils": "^10.0.13", "@types/ws": "^8.0.0", "graphql-ws": "^5.14.0", "isomorphic-ws": "^5.0.0", diff --git a/packages/executors/http/package.json b/packages/executors/http/package.json index 85c2664be74..21da4df22f8 100644 --- a/packages/executors/http/package.json +++ b/packages/executors/http/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.2", + "@graphql-tools/utils": "^10.0.13", "@repeaterjs/repeater": "^3.0.4", "@whatwg-node/fetch": "^0.9.0", "extract-files": "^11.0.0", diff --git a/packages/executors/legacy-ws/package.json b/packages/executors/legacy-ws/package.json index bf930a28021..9c2d50a5143 100644 --- a/packages/executors/legacy-ws/package.json +++ b/packages/executors/legacy-ws/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "@types/ws": "^8.0.0", "isomorphic-ws": "^5.0.0", "tslib": "^2.4.0", diff --git a/packages/executors/urql-exchange/package.json b/packages/executors/urql-exchange/package.json index 8463ac77160..208f46cd6ab 100644 --- a/packages/executors/urql-exchange/package.json +++ b/packages/executors/urql-exchange/package.json @@ -48,7 +48,7 @@ "wonka": "^6.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0" }, "devDependencies": { diff --git a/packages/executors/yoga/package.json b/packages/executors/yoga/package.json index 87eabc80d8e..3827a607122 100644 --- a/packages/executors/yoga/package.json +++ b/packages/executors/yoga/package.json @@ -53,7 +53,7 @@ }, "dependencies": { "@graphql-tools/executor-envelop": "^2.0.3", - "@graphql-tools/utils": "^10.0.1", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.3.1" }, "devDependencies": { diff --git a/packages/federation/package.json b/packages/federation/package.json index ee8ba80a713..7728e6b50c5 100644 --- a/packages/federation/package.json +++ b/packages/federation/package.json @@ -51,12 +51,12 @@ }, "dependencies": { "@graphql-tools/delegate": "^10.0.3", - "@graphql-tools/executor-http": "^1.0.6", - "@graphql-tools/merge": "^9.0.0", - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/stitch": "^9.0.2", - "@graphql-tools/utils": "^10.0.0", - "@graphql-tools/wrap": "^10.0.0", + "@graphql-tools/executor-http": "^1.0.8", + "@graphql-tools/merge": "^9.0.1", + "@graphql-tools/schema": "^10.0.2", + "@graphql-tools/stitch": "^9.0.4", + "@graphql-tools/utils": "^10.0.13", + "@graphql-tools/wrap": "^10.0.1", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" }, diff --git a/packages/federation/test/gateway.test.ts b/packages/federation/test/gateway.test.ts index 424b331cf9a..74bf33b59f1 100644 --- a/packages/federation/test/gateway.test.ts +++ b/packages/federation/test/gateway.test.ts @@ -261,6 +261,12 @@ describe('Federation', () => { errors, }; } + + if (subgraphName === 'inventory') { + console.log(print(executionRequest.document)); + } else { + } + return executor(executionRequest); }; }, @@ -330,46 +336,46 @@ describe('Federation', () => { }; }; const scenarios: TestScenario[] = [ - { - name: 'Tools Gateway vs. Tools Subgraph', - buildSubgraphSchema: buildToolsSubgraphSchema, - buildGateway: buildStitchingGateway, - }, - { - name: 'Tools Gateway vs. Apollo Subgraph', - buildSubgraphSchema: buildSubgraphWithApollo, - buildGateway: buildStitchingGateway, - }, - { - name: 'Apollo Gateway vs. Tools Subgraph', - buildSubgraphSchema: buildToolsSubgraphSchema, - buildGateway: buildApolloGateway, - }, - { - name: 'Apollo Gateway with Supergraph vs. Tools Subgraph', - buildSubgraphSchema: buildToolsSubgraphSchema, - buildGateway: buildApolloGatewayWithSupergraph, - }, - { - name: 'Tools Gateway with Supergraph vs. Apollo Subgraph', - buildSubgraphSchema: buildSubgraphWithApollo, - buildGateway: buildStitchingGatewayWithSupergraph, - }, + // { + // name: 'Tools Gateway vs. Tools Subgraph', + // buildSubgraphSchema: buildToolsSubgraphSchema, + // buildGateway: buildStitchingGateway, + // }, + // { + // name: 'Tools Gateway vs. Apollo Subgraph', + // buildSubgraphSchema: buildSubgraphWithApollo, + // buildGateway: buildStitchingGateway, + // }, + // { + // name: 'Apollo Gateway vs. Tools Subgraph', + // buildSubgraphSchema: buildToolsSubgraphSchema, + // buildGateway: buildApolloGateway, + // }, + // { + // name: 'Apollo Gateway with Supergraph vs. Tools Subgraph', + // buildSubgraphSchema: buildToolsSubgraphSchema, + // buildGateway: buildApolloGatewayWithSupergraph, + // }, + // { + // name: 'Tools Gateway with Supergraph vs. Apollo Subgraph', + // buildSubgraphSchema: buildSubgraphWithApollo, + // buildGateway: buildStitchingGatewayWithSupergraph, + // }, { name: 'Tools Gateway with Supergraph vs. Tools Subgraph', buildSubgraphSchema: buildToolsSubgraphSchema, buildGateway: buildStitchingGatewayWithSupergraph, }, - { - name: 'Tools Gateway by converting Federation to Stitching SDL vs. Tools Subgraph', - buildSubgraphSchema: buildToolsSubgraphSchema, - buildGateway: buildStitchingGatewayByConversion, - }, - { - name: 'Tools Gateway by converting Federation to Stitching SDL vs. Apollo Subgraph', - buildSubgraphSchema: buildSubgraphWithApollo, - buildGateway: buildStitchingGatewayByConversion, - }, + // { + // name: 'Tools Gateway by converting Federation to Stitching SDL vs. Tools Subgraph', + // buildSubgraphSchema: buildToolsSubgraphSchema, + // buildGateway: buildStitchingGatewayByConversion, + // }, + // { + // name: 'Tools Gateway by converting Federation to Stitching SDL vs. Apollo Subgraph', + // buildSubgraphSchema: buildSubgraphWithApollo, + // buildGateway: buildStitchingGatewayByConversion, + // }, ]; for (const { name, buildSubgraphSchema, buildGateway } of scenarios) { describe(name, () => { @@ -423,7 +429,7 @@ describe('Federation', () => { } `); }); - it('should give the correct result', async () => { + it.only('should give the correct result', async () => { const result = await builtGateway.executor(exampleQuery); expect(result).toEqual({ data: { @@ -895,3 +901,18 @@ describe('Federation', () => { }); } }); + +/* + +query TestQuery($_0__v0_representations: [_Any!]!, $_1__v0_representations: [_Any!]!) { + _0___typename: __typename + _0__entities: _entities(representations: $_0__v0_representations) { + __typename + } + _1___typename: __typename + _1__entities: _entities(representations: $_1__v0_representations) { + __typename + } +} + +*/ diff --git a/packages/graphql-tools/package.json b/packages/graphql-tools/package.json index e6ba190cd27..73b7533f877 100644 --- a/packages/graphql-tools/package.json +++ b/packages/graphql-tools/package.json @@ -50,7 +50,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/schema": "^10.0.0", + "@graphql-tools/schema": "^10.0.2", "tslib": "^2.4.0" }, "optionalDependencies": { diff --git a/packages/import/package.json b/packages/import/package.json index d757d7a97c8..8fb7c7e7ced 100644 --- a/packages/import/package.json +++ b/packages/import/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "resolve-from": "5.0.0", "tslib": "^2.4.0" }, diff --git a/packages/links/package.json b/packages/links/package.json index a4c8202c0dc..060f53ab697 100644 --- a/packages/links/package.json +++ b/packages/links/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@graphql-tools/delegate": "^10.0.3", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "apollo-upload-client": "17.0.0", "form-data": "^4.0.0", "node-fetch": "^2.6.5", diff --git a/packages/load/package.json b/packages/load/package.json index 76ed6ad5ab3..4cd466b7e39 100644 --- a/packages/load/package.json +++ b/packages/load/package.json @@ -51,8 +51,8 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/utils": "^10.0.11", + "@graphql-tools/schema": "^10.0.2", + "@graphql-tools/utils": "^10.0.13", "p-limit": "3.1.0", "tslib": "^2.4.0" }, diff --git a/packages/loaders/apollo-engine/package.json b/packages/loaders/apollo-engine/package.json index db0776b7a28..d604f35bb72 100644 --- a/packages/loaders/apollo-engine/package.json +++ b/packages/loaders/apollo-engine/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@ardatan/sync-fetch": "^0.0.1", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "@whatwg-node/fetch": "^0.9.0", "tslib": "^2.4.0" }, diff --git a/packages/loaders/github/package.json b/packages/loaders/github/package.json index b36be53eb62..6b1389f3b23 100644 --- a/packages/loaders/github/package.json +++ b/packages/loaders/github/package.json @@ -52,9 +52,9 @@ }, "dependencies": { "@ardatan/sync-fetch": "^0.0.1", - "@graphql-tools/executor-http": "^1.0.0", + "@graphql-tools/executor-http": "^1.0.8", "@graphql-tools/graphql-tag-pluck": "^8.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "@whatwg-node/fetch": "^0.9.0", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" diff --git a/packages/loaders/graphql-file/package.json b/packages/loaders/graphql-file/package.json index 7cf746029b9..dc30bd7b876 100644 --- a/packages/loaders/graphql-file/package.json +++ b/packages/loaders/graphql-file/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@graphql-tools/import": "7.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "globby": "^11.0.3", "tslib": "^2.4.0", "unixify": "^1.0.0" diff --git a/packages/loaders/json-file/package.json b/packages/loaders/json-file/package.json index 6bab7c6f419..35425a01d88 100644 --- a/packages/loaders/json-file/package.json +++ b/packages/loaders/json-file/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "globby": "^11.0.3", "tslib": "^2.4.0", "unixify": "^1.0.0" diff --git a/packages/loaders/module/package.json b/packages/loaders/module/package.json index 94ad71a0672..3308b1d1092 100644 --- a/packages/loaders/module/package.json +++ b/packages/loaders/module/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0" }, "publishConfig": { diff --git a/packages/loaders/prisma/package.json b/packages/loaders/prisma/package.json index 8506ab59a31..bed2b55069a 100644 --- a/packages/loaders/prisma/package.json +++ b/packages/loaders/prisma/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@graphql-tools/url-loader": "^8.0.0", - "@graphql-tools/utils": "^10.0.8", + "@graphql-tools/utils": "^10.0.13", "@types/js-yaml": "^4.0.0", "@types/json-stable-stringify": "^1.0.32", "@whatwg-node/fetch": "^0.9.0", diff --git a/packages/loaders/url/package.json b/packages/loaders/url/package.json index b08fbe46035..be1d97171c2 100644 --- a/packages/loaders/url/package.json +++ b/packages/loaders/url/package.json @@ -54,10 +54,10 @@ "@ardatan/sync-fetch": "^0.0.1", "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/executor-graphql-ws": "^1.0.0", - "@graphql-tools/executor-http": "^1.0.5", + "@graphql-tools/executor-http": "^1.0.8", "@graphql-tools/executor-legacy-ws": "^1.0.0", - "@graphql-tools/utils": "^10.0.0", - "@graphql-tools/wrap": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", + "@graphql-tools/wrap": "^10.0.1", "@types/ws": "^8.0.0", "@whatwg-node/fetch": "^0.9.0", "isomorphic-ws": "^5.0.0", diff --git a/packages/merge/package.json b/packages/merge/package.json index 84e73c9d92c..610d5d2f03d 100644 --- a/packages/merge/package.json +++ b/packages/merge/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.10", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0" }, "publishConfig": { diff --git a/packages/mock/package.json b/packages/mock/package.json index 19aaa9144e7..cb71db43a2a 100644 --- a/packages/mock/package.json +++ b/packages/mock/package.json @@ -50,7 +50,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/schema": "^10.0.0", + "@graphql-tools/schema": "^10.0.2", "@graphql-tools/utils": "^10.0.13", "fast-json-stable-stringify": "^2.1.0", "tslib": "^2.4.0" diff --git a/packages/node-require/package.json b/packages/node-require/package.json index 2e72d9d6bc0..af1ed710f79 100644 --- a/packages/node-require/package.json +++ b/packages/node-require/package.json @@ -52,7 +52,7 @@ "dependencies": { "@graphql-tools/graphql-file-loader": "8.0.0", "@graphql-tools/load": "8.0.1", - "@graphql-tools/utils": "^10.0.11", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0" }, "publishConfig": { diff --git a/packages/relay-operation-optimizer/package.json b/packages/relay-operation-optimizer/package.json index a66e2c1f3c8..fe269c30da2 100644 --- a/packages/relay-operation-optimizer/package.json +++ b/packages/relay-operation-optimizer/package.json @@ -63,7 +63,7 @@ }, "dependencies": { "@ardatan/relay-compiler": "12.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0" }, "devDependencies": { diff --git a/packages/resolvers-composition/package.json b/packages/resolvers-composition/package.json index 6bb0eafa4f8..2ae0fd0f045 100644 --- a/packages/resolvers-composition/package.json +++ b/packages/resolvers-composition/package.json @@ -51,7 +51,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "lodash": "4.17.21", "micromatch": "^4.0.4", "tslib": "^2.4.0" diff --git a/packages/schema/package.json b/packages/schema/package.json index 8cebc10061b..aef27713c7e 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -51,7 +51,7 @@ }, "dependencies": { "@graphql-tools/merge": "^9.0.1", - "@graphql-tools/utils": "^10.0.10", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" }, diff --git a/packages/stitch/package.json b/packages/stitch/package.json index 26890267b4d..5b8e227a707 100644 --- a/packages/stitch/package.json +++ b/packages/stitch/package.json @@ -53,10 +53,10 @@ "@graphql-tools/batch-delegate": "^9.0.0", "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/executor": "^1.0.0", - "@graphql-tools/merge": "^9.0.0", - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/utils": "^10.0.0", - "@graphql-tools/wrap": "^10.0.0", + "@graphql-tools/merge": "^9.0.1", + "@graphql-tools/schema": "^10.0.2", + "@graphql-tools/utils": "^10.0.13", + "@graphql-tools/wrap": "^10.0.1", "tslib": "^2.4.0", "value-or-promise": "^1.0.11" }, diff --git a/packages/stitching-directives/package.json b/packages/stitching-directives/package.json index 6908044464d..87fa2764bb0 100644 --- a/packages/stitching-directives/package.json +++ b/packages/stitching-directives/package.json @@ -51,11 +51,11 @@ }, "dependencies": { "@graphql-tools/delegate": "^10.0.3", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0" }, "devDependencies": { - "@graphql-tools/schema": "^10.0.0" + "@graphql-tools/schema": "^10.0.2" }, "publishConfig": { "directory": "dist", diff --git a/packages/wrap/package.json b/packages/wrap/package.json index 9cc722f6a81..31abb4f139b 100644 --- a/packages/wrap/package.json +++ b/packages/wrap/package.json @@ -51,8 +51,8 @@ }, "dependencies": { "@graphql-tools/delegate": "^10.0.3", - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/schema": "^10.0.2", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" }, From a024366298c18dda065a6d87cd1645d2526bd60e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 22 Feb 2024 15:38:56 +0000 Subject: [PATCH 11/13] chore(dependencies): updated changesets for modified dependencies --- ...@graphql-tools_apollo-engine-loader-5913-dependencies.md | 5 +++++ .../@graphql-tools_batch-delegate-5913-dependencies.md | 1 + .../@graphql-tools_batch-execute-5913-dependencies.md | 5 +++++ .../@graphql-tools_code-file-loader-5913-dependencies.md | 5 ----- .changeset/@graphql-tools_delegate-5913-dependencies.md | 6 ++++++ .changeset/@graphql-tools_executor-5913-dependencies.md | 5 +++++ ...@graphql-tools_executor-apollo-link-5913-dependencies.md | 5 +++++ .../@graphql-tools_executor-envelop-5913-dependencies.md | 6 ++++++ .../@graphql-tools_executor-graphql-ws-5913-dependencies.md | 5 +++++ .../@graphql-tools_executor-http-5913-dependencies.md | 5 +++++ .../@graphql-tools_executor-legacy-ws-5913-dependencies.md | 5 +++++ ...raphql-tools_executor-urql-exchange-5913-dependencies.md | 5 +++++ .../@graphql-tools_executor-yoga-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_federation-5913-dependencies.md | 6 ++++++ .changeset/@graphql-tools_git-loader-5913-dependencies.md | 5 ----- .../@graphql-tools_github-loader-5913-dependencies.md | 6 ++++++ .../@graphql-tools_graphql-file-loader-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_import-5913-dependencies.md | 5 +++++ .../@graphql-tools_json-file-loader-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_links-5913-dependencies.md | 1 + .changeset/@graphql-tools_load-5913-dependencies.md | 6 ++++++ .changeset/@graphql-tools_merge-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_mock-5913-dependencies.md | 5 +++++ .../@graphql-tools_module-loader-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_node-require-5913-dependencies.md | 5 +++++ .../@graphql-tools_prisma-loader-5913-dependencies.md | 5 +++++ ...hql-tools_relay-operation-optimizer-5913-dependencies.md | 5 +++++ ...graphql-tools_resolvers-composition-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_schema-5913-dependencies.md | 5 +++++ .changeset/@graphql-tools_stitch-5913-dependencies.md | 4 ++++ ...@graphql-tools_stitching-directives-5913-dependencies.md | 1 + .changeset/@graphql-tools_url-loader-5913-dependencies.md | 3 +++ .changeset/@graphql-tools_wrap-5913-dependencies.md | 6 ++++++ .changeset/graphql-tools-5913-dependencies.md | 5 +++++ 34 files changed, 151 insertions(+), 10 deletions(-) create mode 100644 .changeset/@graphql-tools_apollo-engine-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_batch-execute-5913-dependencies.md delete mode 100644 .changeset/@graphql-tools_code-file-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_delegate-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-apollo-link-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-envelop-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-graphql-ws-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-http-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-legacy-ws-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-urql-exchange-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-yoga-5913-dependencies.md delete mode 100644 .changeset/@graphql-tools_git-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_github-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_graphql-file-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_import-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_json-file-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_load-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_merge-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_mock-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_module-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_node-require-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_prisma-loader-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_relay-operation-optimizer-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_resolvers-composition-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_schema-5913-dependencies.md create mode 100644 .changeset/@graphql-tools_wrap-5913-dependencies.md create mode 100644 .changeset/graphql-tools-5913-dependencies.md diff --git a/.changeset/@graphql-tools_apollo-engine-loader-5913-dependencies.md b/.changeset/@graphql-tools_apollo-engine-loader-5913-dependencies.md new file mode 100644 index 00000000000..1bd1bd72e8a --- /dev/null +++ b/.changeset/@graphql-tools_apollo-engine-loader-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/apollo-engine-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_batch-delegate-5913-dependencies.md b/.changeset/@graphql-tools_batch-delegate-5913-dependencies.md index d0df2465ddf..a23401fce18 100644 --- a/.changeset/@graphql-tools_batch-delegate-5913-dependencies.md +++ b/.changeset/@graphql-tools_batch-delegate-5913-dependencies.md @@ -3,3 +3,4 @@ --- dependencies updates: - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.1`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_batch-execute-5913-dependencies.md b/.changeset/@graphql-tools_batch-execute-5913-dependencies.md new file mode 100644 index 00000000000..4574b38082f --- /dev/null +++ b/.changeset/@graphql-tools_batch-execute-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/batch-execute": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.5`, in `dependencies`) diff --git a/.changeset/@graphql-tools_code-file-loader-5913-dependencies.md b/.changeset/@graphql-tools_code-file-loader-5913-dependencies.md deleted file mode 100644 index 64b3be9be0a..00000000000 --- a/.changeset/@graphql-tools_code-file-loader-5913-dependencies.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@graphql-tools/code-file-loader": patch ---- -dependencies updates: - - Updated dependency [`@graphql-tools/graphql-tag-pluck@8.3.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/graphql-tag-pluck/v/8.3.0) (from `8.2.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_delegate-5913-dependencies.md b/.changeset/@graphql-tools_delegate-5913-dependencies.md new file mode 100644 index 00000000000..6194c2eb4f0 --- /dev/null +++ b/.changeset/@graphql-tools_delegate-5913-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-tools/delegate": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/schema@^10.0.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.0.2) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.5`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-5913-dependencies.md b/.changeset/@graphql-tools_executor-5913-dependencies.md new file mode 100644 index 00000000000..7eb4d82c13e --- /dev/null +++ b/.changeset/@graphql-tools_executor-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/executor": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.8`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-apollo-link-5913-dependencies.md b/.changeset/@graphql-tools_executor-apollo-link-5913-dependencies.md new file mode 100644 index 00000000000..24555d103b2 --- /dev/null +++ b/.changeset/@graphql-tools_executor-apollo-link-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/executor-apollo-link": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-envelop-5913-dependencies.md b/.changeset/@graphql-tools_executor-envelop-5913-dependencies.md new file mode 100644 index 00000000000..a8d435755c3 --- /dev/null +++ b/.changeset/@graphql-tools_executor-envelop-5913-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-tools/executor-envelop": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/wrap@^10.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/wrap/v/10.0.1) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-graphql-ws-5913-dependencies.md b/.changeset/@graphql-tools_executor-graphql-ws-5913-dependencies.md new file mode 100644 index 00000000000..b539dfaf5d6 --- /dev/null +++ b/.changeset/@graphql-tools_executor-graphql-ws-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/executor-graphql-ws": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.2`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-http-5913-dependencies.md b/.changeset/@graphql-tools_executor-http-5913-dependencies.md new file mode 100644 index 00000000000..1e9e36c2ae2 --- /dev/null +++ b/.changeset/@graphql-tools_executor-http-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/executor-http": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.2`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-legacy-ws-5913-dependencies.md b/.changeset/@graphql-tools_executor-legacy-ws-5913-dependencies.md new file mode 100644 index 00000000000..1ecc96d879c --- /dev/null +++ b/.changeset/@graphql-tools_executor-legacy-ws-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/executor-legacy-ws": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-urql-exchange-5913-dependencies.md b/.changeset/@graphql-tools_executor-urql-exchange-5913-dependencies.md new file mode 100644 index 00000000000..f84a0202cfd --- /dev/null +++ b/.changeset/@graphql-tools_executor-urql-exchange-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/executor-urql-exchange": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-yoga-5913-dependencies.md b/.changeset/@graphql-tools_executor-yoga-5913-dependencies.md new file mode 100644 index 00000000000..a78b3028f16 --- /dev/null +++ b/.changeset/@graphql-tools_executor-yoga-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/executor-yoga": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.1`, in `dependencies`) diff --git a/.changeset/@graphql-tools_federation-5913-dependencies.md b/.changeset/@graphql-tools_federation-5913-dependencies.md index f7273c90a5f..8005c17e182 100644 --- a/.changeset/@graphql-tools_federation-5913-dependencies.md +++ b/.changeset/@graphql-tools_federation-5913-dependencies.md @@ -3,3 +3,9 @@ --- dependencies updates: - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.1`, in `dependencies`) + - Updated dependency [`@graphql-tools/executor-http@^1.0.8` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor-http/v/1.0.8) (from `^1.0.6`, in `dependencies`) + - Updated dependency [`@graphql-tools/merge@^9.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/merge/v/9.0.1) (from `^9.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/schema@^10.0.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.0.2) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/stitch@^9.0.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/stitch/v/9.0.4) (from `^9.0.2`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/wrap@^10.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/wrap/v/10.0.1) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_git-loader-5913-dependencies.md b/.changeset/@graphql-tools_git-loader-5913-dependencies.md deleted file mode 100644 index bf787f5c859..00000000000 --- a/.changeset/@graphql-tools_git-loader-5913-dependencies.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@graphql-tools/git-loader": patch ---- -dependencies updates: - - Updated dependency [`@graphql-tools/graphql-tag-pluck@8.3.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/graphql-tag-pluck/v/8.3.0) (from `8.2.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_github-loader-5913-dependencies.md b/.changeset/@graphql-tools_github-loader-5913-dependencies.md new file mode 100644 index 00000000000..a86bbf27683 --- /dev/null +++ b/.changeset/@graphql-tools_github-loader-5913-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-tools/github-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/executor-http@^1.0.8` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor-http/v/1.0.8) (from `^1.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_graphql-file-loader-5913-dependencies.md b/.changeset/@graphql-tools_graphql-file-loader-5913-dependencies.md new file mode 100644 index 00000000000..3196f1caea6 --- /dev/null +++ b/.changeset/@graphql-tools_graphql-file-loader-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/graphql-file-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_import-5913-dependencies.md b/.changeset/@graphql-tools_import-5913-dependencies.md new file mode 100644 index 00000000000..949e571a6ab --- /dev/null +++ b/.changeset/@graphql-tools_import-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/import": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_json-file-loader-5913-dependencies.md b/.changeset/@graphql-tools_json-file-loader-5913-dependencies.md new file mode 100644 index 00000000000..38e101acbbb --- /dev/null +++ b/.changeset/@graphql-tools_json-file-loader-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/json-file-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_links-5913-dependencies.md b/.changeset/@graphql-tools_links-5913-dependencies.md index e4b6e1193a0..2208689aba9 100644 --- a/.changeset/@graphql-tools_links-5913-dependencies.md +++ b/.changeset/@graphql-tools_links-5913-dependencies.md @@ -3,3 +3,4 @@ --- dependencies updates: - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_load-5913-dependencies.md b/.changeset/@graphql-tools_load-5913-dependencies.md new file mode 100644 index 00000000000..c65858c5296 --- /dev/null +++ b/.changeset/@graphql-tools_load-5913-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-tools/load": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/schema@^10.0.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.0.2) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.11`, in `dependencies`) diff --git a/.changeset/@graphql-tools_merge-5913-dependencies.md b/.changeset/@graphql-tools_merge-5913-dependencies.md new file mode 100644 index 00000000000..1439d8f0b67 --- /dev/null +++ b/.changeset/@graphql-tools_merge-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/merge": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.10`, in `dependencies`) diff --git a/.changeset/@graphql-tools_mock-5913-dependencies.md b/.changeset/@graphql-tools_mock-5913-dependencies.md new file mode 100644 index 00000000000..c8d40dffde8 --- /dev/null +++ b/.changeset/@graphql-tools_mock-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/mock": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/schema@^10.0.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.0.2) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_module-loader-5913-dependencies.md b/.changeset/@graphql-tools_module-loader-5913-dependencies.md new file mode 100644 index 00000000000..3cc047dca93 --- /dev/null +++ b/.changeset/@graphql-tools_module-loader-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/module-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_node-require-5913-dependencies.md b/.changeset/@graphql-tools_node-require-5913-dependencies.md new file mode 100644 index 00000000000..c36fff527a6 --- /dev/null +++ b/.changeset/@graphql-tools_node-require-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/node-require": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.11`, in `dependencies`) diff --git a/.changeset/@graphql-tools_prisma-loader-5913-dependencies.md b/.changeset/@graphql-tools_prisma-loader-5913-dependencies.md new file mode 100644 index 00000000000..954e1e4f31c --- /dev/null +++ b/.changeset/@graphql-tools_prisma-loader-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/prisma-loader": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.8`, in `dependencies`) diff --git a/.changeset/@graphql-tools_relay-operation-optimizer-5913-dependencies.md b/.changeset/@graphql-tools_relay-operation-optimizer-5913-dependencies.md new file mode 100644 index 00000000000..3c8fab6bb85 --- /dev/null +++ b/.changeset/@graphql-tools_relay-operation-optimizer-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/relay-operation-optimizer": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_resolvers-composition-5913-dependencies.md b/.changeset/@graphql-tools_resolvers-composition-5913-dependencies.md new file mode 100644 index 00000000000..0ad2365cb61 --- /dev/null +++ b/.changeset/@graphql-tools_resolvers-composition-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/resolvers-composition": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_schema-5913-dependencies.md b/.changeset/@graphql-tools_schema-5913-dependencies.md new file mode 100644 index 00000000000..06dcc8d3ec9 --- /dev/null +++ b/.changeset/@graphql-tools_schema-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-tools/schema": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.10`, in `dependencies`) diff --git a/.changeset/@graphql-tools_stitch-5913-dependencies.md b/.changeset/@graphql-tools_stitch-5913-dependencies.md index 7b4ad48bc24..747cc409a8a 100644 --- a/.changeset/@graphql-tools_stitch-5913-dependencies.md +++ b/.changeset/@graphql-tools_stitch-5913-dependencies.md @@ -3,3 +3,7 @@ --- dependencies updates: - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.1`, in `dependencies`) + - Updated dependency [`@graphql-tools/merge@^9.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/merge/v/9.0.1) (from `^9.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/schema@^10.0.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.0.2) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/wrap@^10.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/wrap/v/10.0.1) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_stitching-directives-5913-dependencies.md b/.changeset/@graphql-tools_stitching-directives-5913-dependencies.md index 66d0c4e0953..37846735d03 100644 --- a/.changeset/@graphql-tools_stitching-directives-5913-dependencies.md +++ b/.changeset/@graphql-tools_stitching-directives-5913-dependencies.md @@ -3,3 +3,4 @@ --- dependencies updates: - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_url-loader-5913-dependencies.md b/.changeset/@graphql-tools_url-loader-5913-dependencies.md index 806a9ad95e7..16f86cc0ca0 100644 --- a/.changeset/@graphql-tools_url-loader-5913-dependencies.md +++ b/.changeset/@graphql-tools_url-loader-5913-dependencies.md @@ -3,3 +3,6 @@ --- dependencies updates: - Updated dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/executor-http@^1.0.8` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor-http/v/1.0.8) (from `^1.0.5`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/wrap@^10.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/wrap/v/10.0.1) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_wrap-5913-dependencies.md b/.changeset/@graphql-tools_wrap-5913-dependencies.md new file mode 100644 index 00000000000..328029466b1 --- /dev/null +++ b/.changeset/@graphql-tools_wrap-5913-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-tools/wrap": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/schema@^10.0.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.0.2) (from `^10.0.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.0.13` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.13) (from `^10.0.0`, in `dependencies`) diff --git a/.changeset/graphql-tools-5913-dependencies.md b/.changeset/graphql-tools-5913-dependencies.md new file mode 100644 index 00000000000..1624b8110d0 --- /dev/null +++ b/.changeset/graphql-tools-5913-dependencies.md @@ -0,0 +1,5 @@ +--- +"graphql-tools": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/schema@^10.0.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.0.2) (from `^10.0.0`, in `dependencies`) From a3e669fc440bf807791fce711091ed72d89976c7 Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Thu, 22 Feb 2024 16:43:41 +0100 Subject: [PATCH 12/13] revert misses --- .../delegate/src/prepareGatewayDocument.ts | 1 - packages/federation/test/gateway.test.ts | 91 +++++++------------ 2 files changed, 35 insertions(+), 57 deletions(-) diff --git a/packages/delegate/src/prepareGatewayDocument.ts b/packages/delegate/src/prepareGatewayDocument.ts index 7805db42400..dbb7682ec9e 100644 --- a/packages/delegate/src/prepareGatewayDocument.ts +++ b/packages/delegate/src/prepareGatewayDocument.ts @@ -446,7 +446,6 @@ function wrapConcreteTypes( [Kind.FIELD]: (node: FieldNode) => { let type = typeInfo.getType(); type = isNonNullType(type) ? type.ofType : type; - console.trace(); if ( type != null && isAbstractType(getNamedType(type)) && diff --git a/packages/federation/test/gateway.test.ts b/packages/federation/test/gateway.test.ts index 74bf33b59f1..4d492d89cfa 100644 --- a/packages/federation/test/gateway.test.ts +++ b/packages/federation/test/gateway.test.ts @@ -261,12 +261,6 @@ describe('Federation', () => { errors, }; } - - if (subgraphName === 'inventory') { - console.log(print(executionRequest.document)); - } else { - } - return executor(executionRequest); }; }, @@ -336,46 +330,46 @@ describe('Federation', () => { }; }; const scenarios: TestScenario[] = [ - // { - // name: 'Tools Gateway vs. Tools Subgraph', - // buildSubgraphSchema: buildToolsSubgraphSchema, - // buildGateway: buildStitchingGateway, - // }, - // { - // name: 'Tools Gateway vs. Apollo Subgraph', - // buildSubgraphSchema: buildSubgraphWithApollo, - // buildGateway: buildStitchingGateway, - // }, - // { - // name: 'Apollo Gateway vs. Tools Subgraph', - // buildSubgraphSchema: buildToolsSubgraphSchema, - // buildGateway: buildApolloGateway, - // }, - // { - // name: 'Apollo Gateway with Supergraph vs. Tools Subgraph', - // buildSubgraphSchema: buildToolsSubgraphSchema, - // buildGateway: buildApolloGatewayWithSupergraph, - // }, - // { - // name: 'Tools Gateway with Supergraph vs. Apollo Subgraph', - // buildSubgraphSchema: buildSubgraphWithApollo, - // buildGateway: buildStitchingGatewayWithSupergraph, - // }, + { + name: 'Tools Gateway vs. Tools Subgraph', + buildSubgraphSchema: buildToolsSubgraphSchema, + buildGateway: buildStitchingGateway, + }, + { + name: 'Tools Gateway vs. Apollo Subgraph', + buildSubgraphSchema: buildSubgraphWithApollo, + buildGateway: buildStitchingGateway, + }, + { + name: 'Apollo Gateway vs. Tools Subgraph', + buildSubgraphSchema: buildToolsSubgraphSchema, + buildGateway: buildApolloGateway, + }, + { + name: 'Apollo Gateway with Supergraph vs. Tools Subgraph', + buildSubgraphSchema: buildToolsSubgraphSchema, + buildGateway: buildApolloGatewayWithSupergraph, + }, + { + name: 'Tools Gateway with Supergraph vs. Apollo Subgraph', + buildSubgraphSchema: buildSubgraphWithApollo, + buildGateway: buildStitchingGatewayWithSupergraph, + }, { name: 'Tools Gateway with Supergraph vs. Tools Subgraph', buildSubgraphSchema: buildToolsSubgraphSchema, buildGateway: buildStitchingGatewayWithSupergraph, }, - // { - // name: 'Tools Gateway by converting Federation to Stitching SDL vs. Tools Subgraph', - // buildSubgraphSchema: buildToolsSubgraphSchema, - // buildGateway: buildStitchingGatewayByConversion, - // }, - // { - // name: 'Tools Gateway by converting Federation to Stitching SDL vs. Apollo Subgraph', - // buildSubgraphSchema: buildSubgraphWithApollo, - // buildGateway: buildStitchingGatewayByConversion, - // }, + { + name: 'Tools Gateway by converting Federation to Stitching SDL vs. Tools Subgraph', + buildSubgraphSchema: buildToolsSubgraphSchema, + buildGateway: buildStitchingGatewayByConversion, + }, + { + name: 'Tools Gateway by converting Federation to Stitching SDL vs. Apollo Subgraph', + buildSubgraphSchema: buildSubgraphWithApollo, + buildGateway: buildStitchingGatewayByConversion, + }, ]; for (const { name, buildSubgraphSchema, buildGateway } of scenarios) { describe(name, () => { @@ -901,18 +895,3 @@ describe('Federation', () => { }); } }); - -/* - -query TestQuery($_0__v0_representations: [_Any!]!, $_1__v0_representations: [_Any!]!) { - _0___typename: __typename - _0__entities: _entities(representations: $_0__v0_representations) { - __typename - } - _1___typename: __typename - _1__entities: _entities(representations: $_1__v0_representations) { - __typename - } -} - -*/ From b27ae8605c354eed2b24844a475c8889ccc90dfb Mon Sep 17 00:00:00 2001 From: enisdenjo Date: Thu, 22 Feb 2024 16:44:18 +0100 Subject: [PATCH 13/13] no only --- packages/federation/test/gateway.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/federation/test/gateway.test.ts b/packages/federation/test/gateway.test.ts index 4d492d89cfa..424b331cf9a 100644 --- a/packages/federation/test/gateway.test.ts +++ b/packages/federation/test/gateway.test.ts @@ -423,7 +423,7 @@ describe('Federation', () => { } `); }); - it.only('should give the correct result', async () => { + it('should give the correct result', async () => { const result = await builtGateway.executor(exampleQuery); expect(result).toEqual({ data: {