From d72209ad82ec53689f93ce5d81bfa52493919ad9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 15:52:32 +0300 Subject: [PATCH] fix(deps): update all non-major dependencies (#620) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Arda TANRIKULU Co-authored-by: github-actions[bot] --- .../@graphql-hive_gateway-620-dependencies.md | 7 + ...l-hive_gateway-runtime-620-dependencies.md | 7 + ...ql-mesh_fusion-runtime-620-dependencies.md | 7 + ...mac-upstream-signature-620-dependencies.md | 7 + ...h_plugin-opentelemetry-620-dependencies.md | 7 + ...mesh_plugin-prometheus-620-dependencies.md | 7 + ...-mesh_transport-common-620-dependencies.md | 7 + ...ql-mesh_transport-http-620-dependencies.md | 7 + ...ransport-http-callback-620-dependencies.md | 7 + ...phql-mesh_transport-ws-620-dependencies.md | 7 + ...l-tools_batch-delegate-620-dependencies.md | 7 + ...ql-tools_batch-execute-620-dependencies.md | 7 + ...graphql-tools_delegate-620-dependencies.md | 7 + ...-tools_executor-common-620-dependencies.md | 7 + ...ls_executor-graphql-ws-620-dependencies.md | 7 + ...ql-tools_executor-http-620-dependencies.md | 7 + ...aphql-tools_federation-620-dependencies.md | 7 + .../@graphql-tools_stitch-620-dependencies.md | 7 + ...s_stitching-directives-620-dependencies.md | 7 + .../@graphql-tools_wrap-620-dependencies.md | 7 + .../federation-batching-plan.e2e.ts | 44 +++--- packages/batch-delegate/package.json | 2 +- packages/batch-execute/package.json | 2 +- packages/batch-execute/src/prefix.ts | 4 +- .../batch-execute/tests/batchExecute.test.ts | 18 +-- packages/delegate/package.json | 2 +- packages/delegate/src/createRequest.ts | 11 +- .../delegate/src/finalizeGatewayRequest.ts | 6 +- packages/delegate/src/updateArguments.ts | 71 +++++++++ packages/executors/common/package.json | 2 +- packages/executors/graphql-ws/package.json | 2 +- packages/executors/http/package.json | 2 +- packages/federation/package.json | 2 +- packages/fusion-runtime/package.json | 2 +- packages/gateway/package.json | 2 +- .../hmac-upstream-signature/package.json | 2 +- packages/plugins/opentelemetry/package.json | 2 +- packages/plugins/prometheus/package.json | 2 +- packages/runtime/package.json | 2 +- packages/stitch/package.json | 2 +- packages/stitching-directives/package.json | 2 +- packages/transports/common/package.json | 2 +- .../transports/http-callback/package.json | 2 +- packages/transports/http/package.json | 2 +- packages/transports/ws/package.json | 2 +- packages/wrap/package.json | 2 +- yarn.lock | 143 ++++++++++-------- 47 files changed, 351 insertions(+), 126 deletions(-) create mode 100644 .changeset/@graphql-hive_gateway-620-dependencies.md create mode 100644 .changeset/@graphql-hive_gateway-runtime-620-dependencies.md create mode 100644 .changeset/@graphql-mesh_fusion-runtime-620-dependencies.md create mode 100644 .changeset/@graphql-mesh_hmac-upstream-signature-620-dependencies.md create mode 100644 .changeset/@graphql-mesh_plugin-opentelemetry-620-dependencies.md create mode 100644 .changeset/@graphql-mesh_plugin-prometheus-620-dependencies.md create mode 100644 .changeset/@graphql-mesh_transport-common-620-dependencies.md create mode 100644 .changeset/@graphql-mesh_transport-http-620-dependencies.md create mode 100644 .changeset/@graphql-mesh_transport-http-callback-620-dependencies.md create mode 100644 .changeset/@graphql-mesh_transport-ws-620-dependencies.md create mode 100644 .changeset/@graphql-tools_batch-delegate-620-dependencies.md create mode 100644 .changeset/@graphql-tools_batch-execute-620-dependencies.md create mode 100644 .changeset/@graphql-tools_delegate-620-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-common-620-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-graphql-ws-620-dependencies.md create mode 100644 .changeset/@graphql-tools_executor-http-620-dependencies.md create mode 100644 .changeset/@graphql-tools_federation-620-dependencies.md create mode 100644 .changeset/@graphql-tools_stitch-620-dependencies.md create mode 100644 .changeset/@graphql-tools_stitching-directives-620-dependencies.md create mode 100644 .changeset/@graphql-tools_wrap-620-dependencies.md create mode 100644 packages/delegate/src/updateArguments.ts diff --git a/.changeset/@graphql-hive_gateway-620-dependencies.md b/.changeset/@graphql-hive_gateway-620-dependencies.md new file mode 100644 index 000000000..2851441e5 --- /dev/null +++ b/.changeset/@graphql-hive_gateway-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-hive/gateway': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-hive_gateway-runtime-620-dependencies.md b/.changeset/@graphql-hive_gateway-runtime-620-dependencies.md new file mode 100644 index 000000000..3719179c7 --- /dev/null +++ b/.changeset/@graphql-hive_gateway-runtime-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-hive/gateway-runtime': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_fusion-runtime-620-dependencies.md b/.changeset/@graphql-mesh_fusion-runtime-620-dependencies.md new file mode 100644 index 000000000..763c920da --- /dev/null +++ b/.changeset/@graphql-mesh_fusion-runtime-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-mesh/fusion-runtime': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_hmac-upstream-signature-620-dependencies.md b/.changeset/@graphql-mesh_hmac-upstream-signature-620-dependencies.md new file mode 100644 index 000000000..7e3d01018 --- /dev/null +++ b/.changeset/@graphql-mesh_hmac-upstream-signature-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-mesh/hmac-upstream-signature': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_plugin-opentelemetry-620-dependencies.md b/.changeset/@graphql-mesh_plugin-opentelemetry-620-dependencies.md new file mode 100644 index 000000000..b70ff0bf7 --- /dev/null +++ b/.changeset/@graphql-mesh_plugin-opentelemetry-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-mesh/plugin-opentelemetry': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_plugin-prometheus-620-dependencies.md b/.changeset/@graphql-mesh_plugin-prometheus-620-dependencies.md new file mode 100644 index 000000000..e36da761a --- /dev/null +++ b/.changeset/@graphql-mesh_plugin-prometheus-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-mesh/plugin-prometheus': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-common-620-dependencies.md b/.changeset/@graphql-mesh_transport-common-620-dependencies.md new file mode 100644 index 000000000..c2701e772 --- /dev/null +++ b/.changeset/@graphql-mesh_transport-common-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-mesh/transport-common': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-http-620-dependencies.md b/.changeset/@graphql-mesh_transport-http-620-dependencies.md new file mode 100644 index 000000000..89a0b146a --- /dev/null +++ b/.changeset/@graphql-mesh_transport-http-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-mesh/transport-http': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-http-callback-620-dependencies.md b/.changeset/@graphql-mesh_transport-http-callback-620-dependencies.md new file mode 100644 index 000000000..6d7917166 --- /dev/null +++ b/.changeset/@graphql-mesh_transport-http-callback-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-mesh/transport-http-callback': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-ws-620-dependencies.md b/.changeset/@graphql-mesh_transport-ws-620-dependencies.md new file mode 100644 index 000000000..a24c2126b --- /dev/null +++ b/.changeset/@graphql-mesh_transport-ws-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-mesh/transport-ws': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_batch-delegate-620-dependencies.md b/.changeset/@graphql-tools_batch-delegate-620-dependencies.md new file mode 100644 index 000000000..ae6a51967 --- /dev/null +++ b/.changeset/@graphql-tools_batch-delegate-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/batch-delegate': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_batch-execute-620-dependencies.md b/.changeset/@graphql-tools_batch-execute-620-dependencies.md new file mode 100644 index 000000000..0872e56c2 --- /dev/null +++ b/.changeset/@graphql-tools_batch-execute-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/batch-execute': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_delegate-620-dependencies.md b/.changeset/@graphql-tools_delegate-620-dependencies.md new file mode 100644 index 000000000..87e6a4643 --- /dev/null +++ b/.changeset/@graphql-tools_delegate-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/delegate': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-common-620-dependencies.md b/.changeset/@graphql-tools_executor-common-620-dependencies.md new file mode 100644 index 000000000..79c6bef06 --- /dev/null +++ b/.changeset/@graphql-tools_executor-common-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/executor-common': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-graphql-ws-620-dependencies.md b/.changeset/@graphql-tools_executor-graphql-ws-620-dependencies.md new file mode 100644 index 000000000..2e1c48150 --- /dev/null +++ b/.changeset/@graphql-tools_executor-graphql-ws-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/executor-graphql-ws': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_executor-http-620-dependencies.md b/.changeset/@graphql-tools_executor-http-620-dependencies.md new file mode 100644 index 000000000..bd6bbba62 --- /dev/null +++ b/.changeset/@graphql-tools_executor-http-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/executor-http': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_federation-620-dependencies.md b/.changeset/@graphql-tools_federation-620-dependencies.md new file mode 100644 index 000000000..f5faa191a --- /dev/null +++ b/.changeset/@graphql-tools_federation-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/federation': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_stitch-620-dependencies.md b/.changeset/@graphql-tools_stitch-620-dependencies.md new file mode 100644 index 000000000..209e0b136 --- /dev/null +++ b/.changeset/@graphql-tools_stitch-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/stitch': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_stitching-directives-620-dependencies.md b/.changeset/@graphql-tools_stitching-directives-620-dependencies.md new file mode 100644 index 000000000..dd2f91bfa --- /dev/null +++ b/.changeset/@graphql-tools_stitching-directives-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/stitching-directives': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/.changeset/@graphql-tools_wrap-620-dependencies.md b/.changeset/@graphql-tools_wrap-620-dependencies.md new file mode 100644 index 000000000..24a1adf5e --- /dev/null +++ b/.changeset/@graphql-tools_wrap-620-dependencies.md @@ -0,0 +1,7 @@ +--- +'@graphql-tools/wrap': patch +--- + +dependencies updates: + +- Updated dependency [`@graphql-tools/utils@^10.8.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.8.1) (from `^10.7.0`, in `dependencies`) diff --git a/e2e/federation-batching-plan/federation-batching-plan.e2e.ts b/e2e/federation-batching-plan/federation-batching-plan.e2e.ts index b917b6d43..6db96d8a4 100644 --- a/e2e/federation-batching-plan/federation-batching-plan.e2e.ts +++ b/e2e/federation-batching-plan/federation-batching-plan.e2e.ts @@ -492,17 +492,17 @@ it('should consistently explain the query plan', async () => { "variables": {}, }, { - "query": "query TestQuery($_0__v0_representations: [_Any!]!, $_1__v0_representations: [_Any!]!) { - _0___typename: __typename - _0__entities: _entities(representations: $_0__v0_representations) { + "query": "query TestQuery($_v0_representations: [_Any!]!, $_v1_representations: [_Any!]!) { + _v0___typename: __typename + _v0__entities: _entities(representations: $_v0_representations) { __typename ... on Product { upc inStock } } - _1___typename: __typename - _1__entities: _entities(representations: $_1__v0_representations) { + _v1___typename: __typename + _v1__entities: _entities(representations: $_v1_representations) { __typename ... on Product { upc @@ -512,7 +512,7 @@ it('should consistently explain the query plan', async () => { }", "subgraphName": "inventory", "variables": { - "_0__v0_representations": [ + "_v0_representations": [ { "__typename": "Product", "price": 899, @@ -532,7 +532,7 @@ it('should consistently explain the query plan', async () => { "weight": 50, }, ], - "_1__v0_representations": [ + "_v1_representations": [ { "__typename": "Product", "price": 899, @@ -555,9 +555,9 @@ it('should consistently explain the query plan', async () => { }, }, { - "query": "query TestQuery($_v0_first: Int) { + "query": "query TestQuery($first: Int) { __typename - topProducts(first: $_v0_first) { + topProducts(first: $first) { __typename ...Product upc @@ -576,13 +576,13 @@ it('should consistently explain the query plan', async () => { }", "subgraphName": "products", "variables": { - "_v0_first": 5, + "first": 5, }, }, { - "query": "query TestQuery($_v0_representations: [_Any!]!) { + "query": "query TestQuery($representations: [_Any!]!) { __typename - _entities(representations: $_v0_representations) { + _entities(representations: $representations) { __typename ... on Product { upc @@ -596,7 +596,7 @@ it('should consistently explain the query plan', async () => { }", "subgraphName": "products", "variables": { - "_v0_representations": [ + "representations": [ { "__typename": "Product", "upc": "1", @@ -613,9 +613,9 @@ it('should consistently explain the query plan', async () => { }, }, { - "query": "query TestQuery($_v0_representations: [_Any!]!) { + "query": "query TestQuery($representations: [_Any!]!) { __typename - _entities(representations: $_v0_representations) { + _entities(representations: $representations) { __typename ... on Product { upc @@ -662,7 +662,7 @@ it('should consistently explain the query plan', async () => { }", "subgraphName": "reviews", "variables": { - "_v0_representations": [ + "representations": [ { "__typename": "Product", "upc": "1", @@ -679,9 +679,9 @@ it('should consistently explain the query plan', async () => { }, }, { - "query": "query TestQuery($_v0_representations: [_Any!]!) { + "query": "query TestQuery($representations: [_Any!]!) { __typename - _entities(representations: $_v0_representations) { + _entities(representations: $representations) { __typename ... on User { id @@ -738,7 +738,7 @@ it('should consistently explain the query plan', async () => { }", "subgraphName": "reviews", "variables": { - "_v0_representations": [ + "representations": [ { "__typename": "User", "id": "1", @@ -751,9 +751,9 @@ it('should consistently explain the query plan', async () => { }, }, { - "query": "query TestQuery($_v0_representations: [_Any!]!) { + "query": "query TestQuery($representations: [_Any!]!) { __typename - _entities(representations: $_v0_representations) { + _entities(representations: $representations) { __typename ... on User { id @@ -764,7 +764,7 @@ it('should consistently explain the query plan', async () => { }", "subgraphName": "accounts", "variables": { - "_v0_representations": [ + "representations": [ { "__typename": "User", "id": "1", diff --git a/packages/batch-delegate/package.json b/packages/batch-delegate/package.json index 30da53f43..1b324dd14 100644 --- a/packages/batch-delegate/package.json +++ b/packages/batch-delegate/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@graphql-tools/delegate": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "dataloader": "^2.2.3", "tslib": "^2.8.1" }, diff --git a/packages/batch-execute/package.json b/packages/batch-execute/package.json index ab5b403ca..cd0284377 100644 --- a/packages/batch-execute/package.json +++ b/packages/batch-execute/package.json @@ -38,7 +38,7 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "dependencies": { - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "dataloader": "^2.2.3", "tslib": "^2.8.1" }, diff --git a/packages/batch-execute/src/prefix.ts b/packages/batch-execute/src/prefix.ts index ce707e6fc..8724de5b5 100644 --- a/packages/batch-execute/src/prefix.ts +++ b/packages/batch-execute/src/prefix.ts @@ -1,13 +1,13 @@ // adapted from https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js export function createPrefix(index: number): string { - return `_${index}_`; + return `_v${index}_`; } export type KeyMatch = { index: number; originalKey: string }; function matchKey(prefixedKey: string): KeyMatch | null { - const match = /^_(\d+)_(.*)$/.exec(prefixedKey); + const match = /^_v(\d+)_(.*)$/.exec(prefixedKey); if (match && match.length === 3 && !isNaN(Number(match[1])) && match[2]) { return { index: Number(match[1]), originalKey: match[2] }; } diff --git a/packages/batch-execute/tests/batchExecute.test.ts b/packages/batch-execute/tests/batchExecute.test.ts index 60a32ad50..3f94394e0 100644 --- a/packages/batch-execute/tests/batchExecute.test.ts +++ b/packages/batch-execute/tests/batchExecute.test.ts @@ -128,7 +128,7 @@ describe('batch execution', () => { expect(first?.data).toEqual({ field3: '1' }); expect(second?.data).toEqual({ field3: '2' }); - expect(executorVariables).toEqual({ _0_a: '1', _1_a: '2' }); + expect(executorVariables).toEqual({ _v0_a: '1', _v1_a: '2' }); expect(executorCalls).toEqual(1); }); @@ -155,8 +155,8 @@ describe('batch execution', () => { ])) as ExecutionResult[]; const squishedDoc = executorDocument?.replace(/\s+/g, ' '); - expect(squishedDoc).toMatch('... on Query { _0_field1: field1 }'); - expect(squishedDoc).toMatch('... on Query { _1_field2: field2 }'); + expect(squishedDoc).toMatch('... on Query { _v0_field1: field1 }'); + expect(squishedDoc).toMatch('... on Query { _v1_field2: field2 }'); expect(first?.data).toEqual({ field1: '1' }); expect(second?.data).toEqual({ field2: '2' }); expect(executorCalls).toEqual(1); @@ -177,10 +177,10 @@ describe('batch execution', () => { ])) as ExecutionResult[]; const squishedDoc = executorDocument?.replace(/\s+/g, ' '); - expect(squishedDoc).toMatch('_0_widget: widget { ..._0_A }'); - expect(squishedDoc).toMatch('_1_widget: widget { ..._1_A }'); - expect(squishedDoc).toMatch('fragment _0_A on Widget'); - expect(squishedDoc).toMatch('fragment _1_A on Widget'); + expect(squishedDoc).toMatch('_v0_widget: widget { ..._v0_A }'); + expect(squishedDoc).toMatch('_v1_widget: widget { ..._v1_A }'); + expect(squishedDoc).toMatch('fragment _v0_A on Widget'); + expect(squishedDoc).toMatch('fragment _v1_A on Widget'); expect(first?.data).toEqual({ widget: { name: 'wingnut' } }); expect(second?.data).toEqual({ widget: { name: 'wingnut' } }); expect(executorCalls).toEqual(1); @@ -261,12 +261,12 @@ describe('batch execution', () => { const [first, second] = (await Promise.all([ batchExec({ document: parse( - '{ boomWithPath(message: "unexpected error", path: ["some-prefix", "_0_boomWithPath", "foo"]) }', + '{ boomWithPath(message: "unexpected error", path: ["some-prefix", "_v0_boomWithPath", "foo"]) }', ), }), batchExec({ document: parse( - '{ boomWithPath(message: "another unexpected error", path: ["some", "other", "prefix", "_1_boomWithPath", "bar"]) }', + '{ boomWithPath(message: "another unexpected error", path: ["some", "other", "prefix", "_v1_boomWithPath", "bar"]) }', ), }), ])) as ExecutionResult[]; diff --git a/packages/delegate/package.json b/packages/delegate/package.json index ef998bf9d..70a2a7dcf 100644 --- a/packages/delegate/package.json +++ b/packages/delegate/package.json @@ -41,7 +41,7 @@ "@graphql-tools/batch-execute": "workspace:^", "@graphql-tools/executor": "^1.3.10", "@graphql-tools/schema": "^10.0.11", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@repeaterjs/repeater": "^3.0.6", "dataloader": "^2.2.3", "dset": "^3.1.2", diff --git a/packages/delegate/src/createRequest.ts b/packages/delegate/src/createRequest.ts index af4624ed5..e15eda92d 100644 --- a/packages/delegate/src/createRequest.ts +++ b/packages/delegate/src/createRequest.ts @@ -1,9 +1,4 @@ -import { - createVariableNameGenerator, - ExecutionRequest, - serializeInputValue, - updateArgument, -} from '@graphql-tools/utils'; +import { ExecutionRequest, serializeInputValue } from '@graphql-tools/utils'; import { ArgumentNode, DefinitionNode, @@ -23,6 +18,10 @@ import { VariableDefinitionNode, } from 'graphql'; import { ICreateRequest } from './types.js'; +import { + createVariableNameGenerator, + updateArgument, +} from './updateArguments.js'; export function getDelegatingOperation( parentType: GraphQLObjectType, diff --git a/packages/delegate/src/finalizeGatewayRequest.ts b/packages/delegate/src/finalizeGatewayRequest.ts index 3795a302a..661a35b34 100644 --- a/packages/delegate/src/finalizeGatewayRequest.ts +++ b/packages/delegate/src/finalizeGatewayRequest.ts @@ -2,12 +2,10 @@ import { CRITICAL_ERROR } from '@graphql-tools/executor'; import { ASTVisitorKeyMap, createGraphQLError, - createVariableNameGenerator, ExecutionRequest, getDefinedRootType, implementsAbstractType, serializeInputValue, - updateArgument, } from '@graphql-tools/utils'; import { ArgumentNode, @@ -38,6 +36,10 @@ import { getDocumentMetadata } from './getDocumentMetadata.js'; import { getTypeInfo, getTypeInfoWithType } from './getTypeInfo.js'; import { Subschema } from './Subschema.js'; import { DelegationContext, StitchingInfo } from './types.js'; +import { + createVariableNameGenerator, + updateArgument, +} from './updateArguments.js'; function finalizeGatewayDocument( targetSchema: GraphQLSchema, diff --git a/packages/delegate/src/updateArguments.ts b/packages/delegate/src/updateArguments.ts new file mode 100644 index 000000000..7fa034a8e --- /dev/null +++ b/packages/delegate/src/updateArguments.ts @@ -0,0 +1,71 @@ +import { astFromType } from '@graphql-tools/utils'; +import { + ArgumentNode, + GraphQLInputType, + Kind, + VariableDefinitionNode, +} from 'graphql'; + +export function updateArgument( + argumentNodes: Record, + variableDefinitionsMap: Record, + variableValues: Record, + argName: string, + varName: string, + type: GraphQLInputType, + value: any, +): void { + argumentNodes[argName] = { + kind: Kind.ARGUMENT, + name: { + kind: Kind.NAME, + value: argName, + }, + value: { + kind: Kind.VARIABLE, + name: { + kind: Kind.NAME, + value: varName, + }, + }, + }; + + variableDefinitionsMap[varName] = { + kind: Kind.VARIABLE_DEFINITION, + variable: { + kind: Kind.VARIABLE, + name: { + kind: Kind.NAME, + value: varName, + }, + }, + type: astFromType(type), + }; + + if (value !== undefined) { + variableValues[varName] = value; + return; + } + + // including the variable in the map with value of `undefined` + // will actually be translated by graphql-js into `null` + // see https://github.com/graphql/graphql-js/issues/2533 + if (varName in variableValues) { + delete variableValues[varName]; + } +} + +export function createVariableNameGenerator( + variableDefinitionMap: Record, +): (argName: string) => string { + let varCounter = 0; + return (argName: string): string => { + let varName: string; + do { + varName = + varCounter === 0 ? argName : `_v${varCounter.toString()}_${argName}`; + varCounter++; + } while (varName in variableDefinitionMap); + return varName; + }; +} diff --git a/packages/executors/common/package.json b/packages/executors/common/package.json index 780c5c67a..f07cf7618 100644 --- a/packages/executors/common/package.json +++ b/packages/executors/common/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@envelop/core": "^5.0.2", - "@graphql-tools/utils": "^10.7.0" + "@graphql-tools/utils": "^10.8.1" }, "devDependencies": { "graphql": "^16.9.0", diff --git a/packages/executors/graphql-ws/package.json b/packages/executors/graphql-ws/package.json index 062666fc9..275f8cd4f 100644 --- a/packages/executors/graphql-ws/package.json +++ b/packages/executors/graphql-ws/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@graphql-tools/executor-common": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@whatwg-node/disposablestack": "^0.0.5", "graphql-ws": "^6.0.3", "isomorphic-ws": "^5.0.0", diff --git a/packages/executors/http/package.json b/packages/executors/http/package.json index 7c71c0c64..7110d0c51 100644 --- a/packages/executors/http/package.json +++ b/packages/executors/http/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@graphql-tools/executor-common": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@repeaterjs/repeater": "^3.0.4", "@whatwg-node/disposablestack": "^0.0.5", "@whatwg-node/fetch": "^0.10.1", diff --git a/packages/federation/package.json b/packages/federation/package.json index 7746ea552..47413a927 100644 --- a/packages/federation/package.json +++ b/packages/federation/package.json @@ -43,7 +43,7 @@ "@graphql-tools/merge": "^9.0.12", "@graphql-tools/schema": "^10.0.11", "@graphql-tools/stitch": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@graphql-tools/wrap": "workspace:^", "@graphql-yoga/typed-event-target": "^3.0.1", "@whatwg-node/disposablestack": "^0.0.5", diff --git a/packages/fusion-runtime/package.json b/packages/fusion-runtime/package.json index 5bf02d53c..b400ce7d0 100644 --- a/packages/fusion-runtime/package.json +++ b/packages/fusion-runtime/package.json @@ -55,7 +55,7 @@ "@graphql-tools/merge": "^9.0.12", "@graphql-tools/stitch": "workspace:^", "@graphql-tools/stitching-directives": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@graphql-tools/wrap": "workspace:^", "@whatwg-node/disposablestack": "^0.0.5", "constant-case": "^3", diff --git a/packages/gateway/package.json b/packages/gateway/package.json index 63c611a36..831a7abe1 100644 --- a/packages/gateway/package.json +++ b/packages/gateway/package.json @@ -80,7 +80,7 @@ "@graphql-tools/code-file-loader": "^8.1.8", "@graphql-tools/graphql-file-loader": "^8.0.6", "@graphql-tools/load": "^8.0.7", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "commander": "^13.0.0", "dotenv": "^16.3.1", "graphql-ws": "^6.0.3", diff --git a/packages/plugins/hmac-upstream-signature/package.json b/packages/plugins/hmac-upstream-signature/package.json index bf38a29b1..42ac85860 100644 --- a/packages/plugins/hmac-upstream-signature/package.json +++ b/packages/plugins/hmac-upstream-signature/package.json @@ -46,7 +46,7 @@ "@graphql-mesh/types": "^0.103.6", "@graphql-mesh/utils": "^0.103.6", "@graphql-tools/executor-common": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "json-stable-stringify": "^1.1.1", "tslib": "^2.8.1" }, diff --git a/packages/plugins/opentelemetry/package.json b/packages/plugins/opentelemetry/package.json index 55f79f9db..5153e5309 100644 --- a/packages/plugins/opentelemetry/package.json +++ b/packages/plugins/opentelemetry/package.json @@ -48,7 +48,7 @@ "@graphql-mesh/transport-common": "workspace:^", "@graphql-mesh/types": "^0.103.6", "@graphql-mesh/utils": "^0.103.6", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@opentelemetry/api": "^1.9.0", "@opentelemetry/exporter-trace-otlp-grpc": "^0.57.0", "@opentelemetry/exporter-trace-otlp-http": "^0.57.0", diff --git a/packages/plugins/prometheus/package.json b/packages/plugins/prometheus/package.json index 6cf9b8c12..8531b696a 100644 --- a/packages/plugins/prometheus/package.json +++ b/packages/plugins/prometheus/package.json @@ -48,7 +48,7 @@ "@graphql-mesh/cross-helpers": "^0.4.9", "@graphql-mesh/types": "^0.103.6", "@graphql-mesh/utils": "^0.103.6", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@graphql-yoga/plugin-prometheus": "^6.5.3", "@whatwg-node/disposablestack": "^0.0.5", "prom-client": "^15.0.0", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index acfac6c67..e28112037 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -68,7 +68,7 @@ "@graphql-tools/executor-http": "workspace:^", "@graphql-tools/federation": "workspace:^", "@graphql-tools/stitch": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@graphql-tools/wrap": "workspace:^", "@graphql-yoga/plugin-apollo-usage-report": "^0.6.0", "@graphql-yoga/plugin-csrf-prevention": "^3.10.6", diff --git a/packages/stitch/package.json b/packages/stitch/package.json index f5fc163b9..9089828fb 100644 --- a/packages/stitch/package.json +++ b/packages/stitch/package.json @@ -43,7 +43,7 @@ "@graphql-tools/executor": "^1.3.10", "@graphql-tools/merge": "^9.0.12", "@graphql-tools/schema": "^10.0.11", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@graphql-tools/wrap": "workspace:^", "tslib": "^2.8.1" }, diff --git a/packages/stitching-directives/package.json b/packages/stitching-directives/package.json index ff7bf1bb2..dd0f7b6f5 100644 --- a/packages/stitching-directives/package.json +++ b/packages/stitching-directives/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@graphql-tools/delegate": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "tslib": "^2.8.1" }, "devDependencies": { diff --git a/packages/transports/common/package.json b/packages/transports/common/package.json index 28319b5ca..5a28c48b6 100644 --- a/packages/transports/common/package.json +++ b/packages/transports/common/package.json @@ -46,7 +46,7 @@ "@graphql-mesh/types": "^0.103.6", "@graphql-tools/executor": "^1.3.10", "@graphql-tools/executor-common": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "tslib": "^2.8.1" }, "devDependencies": { diff --git a/packages/transports/http-callback/package.json b/packages/transports/http-callback/package.json index 7c5d56b53..58a32bed1 100644 --- a/packages/transports/http-callback/package.json +++ b/packages/transports/http-callback/package.json @@ -48,7 +48,7 @@ "@graphql-mesh/types": "^0.103.6", "@graphql-mesh/utils": "^0.103.6", "@graphql-tools/executor-common": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "@repeaterjs/repeater": "^3.0.6", "@whatwg-node/fetch": "^0.10.1", "tslib": "^2.8.1" diff --git a/packages/transports/http/package.json b/packages/transports/http/package.json index d2aa844bd..321dd087d 100644 --- a/packages/transports/http/package.json +++ b/packages/transports/http/package.json @@ -48,7 +48,7 @@ "@graphql-mesh/types": "^0.103.6", "@graphql-mesh/utils": "^0.103.6", "@graphql-tools/executor-http": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "graphql": "^16.9.0", "tslib": "^2.8.1" }, diff --git a/packages/transports/ws/package.json b/packages/transports/ws/package.json index b95b1855a..964f9f28a 100644 --- a/packages/transports/ws/package.json +++ b/packages/transports/ws/package.json @@ -48,7 +48,7 @@ "@graphql-mesh/types": "^0.103.6", "@graphql-mesh/utils": "^0.103.6", "@graphql-tools/executor-graphql-ws": "workspace:^", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "graphql-ws": "^6.0.3", "tslib": "^2.8.1", "ws": "^8.18.0" diff --git a/packages/wrap/package.json b/packages/wrap/package.json index e99866558..5117d4b4e 100644 --- a/packages/wrap/package.json +++ b/packages/wrap/package.json @@ -40,7 +40,7 @@ "dependencies": { "@graphql-tools/delegate": "workspace:^", "@graphql-tools/schema": "^10.0.11", - "@graphql-tools/utils": "^10.7.0", + "@graphql-tools/utils": "^10.8.1", "tslib": "^2.8.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 185149af1..cb360bb8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3303,7 +3303,7 @@ __metadata: "@graphql-tools/executor-http": "workspace:^" "@graphql-tools/federation": "workspace:^" "@graphql-tools/stitch": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@graphql-tools/wrap": "workspace:^" "@graphql-yoga/plugin-apollo-usage-report": "npm:^0.6.0" "@graphql-yoga/plugin-csrf-prevention": "npm:^3.10.6" @@ -3366,7 +3366,7 @@ __metadata: "@graphql-tools/executor": "npm:^1.3.10" "@graphql-tools/graphql-file-loader": "npm:^8.0.6" "@graphql-tools/load": "npm:^8.0.7" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@parcel/watcher": "npm:^2.3.0" "@rollup/plugin-commonjs": "npm:^28.0.0" "@rollup/plugin-json": "npm:^6.1.0" @@ -3577,7 +3577,7 @@ __metadata: "@graphql-tools/merge": "npm:^9.0.12" "@graphql-tools/stitch": "workspace:^" "@graphql-tools/stitching-directives": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@graphql-tools/wrap": "workspace:^" "@whatwg-node/disposablestack": "npm:^0.0.5" constant-case: "npm:^3" @@ -3599,7 +3599,7 @@ __metadata: "@graphql-mesh/types": "npm:^0.103.6" "@graphql-mesh/utils": "npm:^0.103.6" "@graphql-tools/executor-common": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@types/json-stable-stringify": "npm:^1.1.0" graphql: "npm:^16.9.0" graphql-yoga: "npm:^5.10.11" @@ -3746,7 +3746,7 @@ __metadata: "@graphql-mesh/transport-common": "workspace:^" "@graphql-mesh/types": "npm:^0.103.6" "@graphql-mesh/utils": "npm:^0.103.6" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@opentelemetry/api": "npm:^1.9.0" "@opentelemetry/exporter-trace-otlp-grpc": "npm:^0.57.0" "@opentelemetry/exporter-trace-otlp-http": "npm:^0.57.0" @@ -3774,7 +3774,7 @@ __metadata: "@graphql-mesh/cross-helpers": "npm:^0.4.9" "@graphql-mesh/types": "npm:^0.103.6" "@graphql-mesh/utils": "npm:^0.103.6" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@graphql-yoga/plugin-prometheus": "npm:^6.5.3" "@whatwg-node/disposablestack": "npm:^0.0.5" graphql: "npm:^16.9.0" @@ -3884,7 +3884,7 @@ __metadata: "@graphql-mesh/utils": "npm:^0.103.6" "@graphql-tools/executor": "npm:^1.3.10" "@graphql-tools/executor-common": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" graphql: "npm:^16.9.0" pkgroll: "npm:2.8.2" tslib: "npm:^2.8.1" @@ -3903,7 +3903,7 @@ __metadata: "@graphql-mesh/types": "npm:^0.103.6" "@graphql-mesh/utils": "npm:^0.103.6" "@graphql-tools/executor-common": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@repeaterjs/repeater": "npm:^3.0.6" "@whatwg-node/fetch": "npm:^0.10.1" graphql: "npm:^16.9.0" @@ -3924,7 +3924,7 @@ __metadata: "@graphql-mesh/types": "npm:^0.103.6" "@graphql-mesh/utils": "npm:^0.103.6" "@graphql-tools/executor-http": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" graphql: "npm:^16.9.0" pkgroll: "npm:2.8.2" tslib: "npm:^2.8.1" @@ -3986,7 +3986,7 @@ __metadata: "@graphql-mesh/types": "npm:^0.103.6" "@graphql-mesh/utils": "npm:^0.103.6" "@graphql-tools/executor-graphql-ws": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@types/ws": "npm:^8" graphql: "npm:^16.9.0" graphql-ws: "npm:^6.0.3" @@ -4045,7 +4045,7 @@ __metadata: dependencies: "@graphql-tools/delegate": "workspace:^" "@graphql-tools/schema": "npm:^10.0.11" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" dataloader: "npm:^2.2.3" graphql: "npm:^16.9.0" pkgroll: "npm:2.8.2" @@ -4059,7 +4059,7 @@ __metadata: version: 0.0.0-use.local resolution: "@graphql-tools/batch-execute@workspace:packages/batch-execute" dependencies: - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" dataloader: "npm:^2.2.3" graphql: "npm:^16.9.0" pkgroll: "npm:2.8.2" @@ -4070,17 +4070,17 @@ __metadata: linkType: soft "@graphql-tools/code-file-loader@npm:^8.1.7, @graphql-tools/code-file-loader@npm:^8.1.8": - version: 8.1.13 - resolution: "@graphql-tools/code-file-loader@npm:8.1.13" + version: 8.1.14 + resolution: "@graphql-tools/code-file-loader@npm:8.1.14" dependencies: - "@graphql-tools/graphql-tag-pluck": "npm:8.3.12" - "@graphql-tools/utils": "npm:^10.7.2" + "@graphql-tools/graphql-tag-pluck": "npm:8.3.13" + "@graphql-tools/utils": "npm:^10.8.0" globby: "npm:^11.0.3" tslib: "npm:^2.4.0" unixify: "npm:^1.0.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/fe9639739f0d8b734ea0515217f1aa0def53c137225f0fecd7d3f73daf6db28c927165ecd31c3df64593619c21d2ba2e5f3dbaa37942ac458309fc5092f270ef + checksum: 10c0/5195d08ac0d30c431f68ae8463f173fdb0f94084ac71717693b72d79ab7cfd0ab28101723a58b3979bbe5189062f1495cf1db4a7cf98f0153ca66dcc45cdc372 languageName: node linkType: hard @@ -4091,7 +4091,7 @@ __metadata: "@graphql-tools/batch-execute": "workspace:^" "@graphql-tools/executor": "npm:^1.3.10" "@graphql-tools/schema": "npm:^10.0.11" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@repeaterjs/repeater": "npm:^3.0.6" dataloader: "npm:^2.2.3" dset: "npm:^3.1.2" @@ -4108,7 +4108,7 @@ __metadata: resolution: "@graphql-tools/executor-common@workspace:packages/executors/common" dependencies: "@envelop/core": "npm:^5.0.2" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" graphql: "npm:^16.9.0" pkgroll: "npm:2.8.2" peerDependencies: @@ -4121,7 +4121,7 @@ __metadata: resolution: "@graphql-tools/executor-graphql-ws@workspace:packages/executors/graphql-ws" dependencies: "@graphql-tools/executor-common": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@types/ws": "npm:^8.0.0" "@whatwg-node/disposablestack": "npm:^0.0.5" graphql: "npm:^16.9.0" @@ -4141,7 +4141,7 @@ __metadata: dependencies: "@apollo/server": "npm:^4.11.2" "@graphql-tools/executor-common": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@repeaterjs/repeater": "npm:^3.0.4" "@types/extract-files": "npm:8.1.3" "@whatwg-node/disposablestack": "npm:^0.0.5" @@ -4159,10 +4159,10 @@ __metadata: linkType: soft "@graphql-tools/executor@npm:^1.3.10, @graphql-tools/executor@npm:^1.3.2, @graphql-tools/executor@npm:^1.3.6, @graphql-tools/executor@npm:^1.3.7": - version: 1.3.12 - resolution: "@graphql-tools/executor@npm:1.3.12" + version: 1.3.13 + resolution: "@graphql-tools/executor@npm:1.3.13" dependencies: - "@graphql-tools/utils": "npm:^10.7.2" + "@graphql-tools/utils": "npm:^10.8.0" "@graphql-typed-document-node/core": "npm:^3.2.0" "@repeaterjs/repeater": "npm:^3.0.4" "@whatwg-node/disposablestack": "npm:^0.0.5" @@ -4170,7 +4170,7 @@ __metadata: value-or-promise: "npm:^1.0.12" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/9a8b1ef6105d44563d0800f82e5068bfc614bcb52d735a3f77a0d4dc36d8e30e5c7d3eefcf4f8bd12562d3d3b2dcb631adb1c0baa2e570cb9484b25218ee728f + checksum: 10c0/a3ce5aa6c2d9024a2618f1ba917b79f7cd0bb90dcb2554c1f915d535c90792f44e86a2cff0d635b8011ec7d0f79759a20aa1fc3fda15b1ac93968c81e0500df6 languageName: node linkType: hard @@ -4187,7 +4187,7 @@ __metadata: "@graphql-tools/merge": "npm:^9.0.12" "@graphql-tools/schema": "npm:^10.0.11" "@graphql-tools/stitch": "workspace:^" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@graphql-tools/wrap": "workspace:^" "@graphql-yoga/typed-event-target": "npm:^3.0.1" "@whatwg-node/disposablestack": "npm:^0.0.5" @@ -4203,61 +4203,61 @@ __metadata: linkType: soft "@graphql-tools/graphql-file-loader@npm:^8.0.5, @graphql-tools/graphql-file-loader@npm:^8.0.6": - version: 8.0.12 - resolution: "@graphql-tools/graphql-file-loader@npm:8.0.12" + version: 8.0.13 + resolution: "@graphql-tools/graphql-file-loader@npm:8.0.13" dependencies: - "@graphql-tools/import": "npm:7.0.11" - "@graphql-tools/utils": "npm:^10.7.2" + "@graphql-tools/import": "npm:7.0.12" + "@graphql-tools/utils": "npm:^10.8.0" globby: "npm:^11.0.3" tslib: "npm:^2.4.0" unixify: "npm:^1.0.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/c8aa8f5ce3540959dd40d452407b262518c6b87e0cc131c47c4061d8f53dba08e04f5487ea36c1fa5e3452e4eb205898c68d0e9f20da965609dafb7f032d05b9 + checksum: 10c0/9f5ecc45d36cebb922de4fa3943db2a4b7136d1e9c6dac80674996f0edd580230764fb6106dd904313efab358aa3d677dfd4b5379fdbb89a4c11d481580d9517 languageName: node linkType: hard -"@graphql-tools/graphql-tag-pluck@npm:8.3.12": - version: 8.3.12 - resolution: "@graphql-tools/graphql-tag-pluck@npm:8.3.12" +"@graphql-tools/graphql-tag-pluck@npm:8.3.13": + version: 8.3.13 + resolution: "@graphql-tools/graphql-tag-pluck@npm:8.3.13" dependencies: "@babel/core": "npm:^7.22.9" "@babel/parser": "npm:^7.16.8" "@babel/plugin-syntax-import-assertions": "npm:^7.20.0" "@babel/traverse": "npm:^7.16.8" "@babel/types": "npm:^7.16.8" - "@graphql-tools/utils": "npm:^10.7.2" + "@graphql-tools/utils": "npm:^10.8.0" tslib: "npm:^2.4.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/ea429bf8f30a03ac1f575b49ad5dfde25319e7e7a9ee89625c7010c26b0fb1945014b9480fda69315db522301760630cc0c8cc9877946e8a35b468079dd850b8 + checksum: 10c0/a6d2a72010b8fcc012772c3ec5128872b716f8df66b33ad139b3d3f96c0bad8d10aa9c90fc9163332590e23271e87f8f2e1fdecaa27815f2b056e35a3803af3d languageName: node linkType: hard -"@graphql-tools/import@npm:7.0.11": - version: 7.0.11 - resolution: "@graphql-tools/import@npm:7.0.11" +"@graphql-tools/import@npm:7.0.12": + version: 7.0.12 + resolution: "@graphql-tools/import@npm:7.0.12" dependencies: - "@graphql-tools/utils": "npm:^10.7.2" + "@graphql-tools/utils": "npm:^10.8.0" resolve-from: "npm:5.0.0" tslib: "npm:^2.4.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/059c04632c22976c2b5444aa79213eac753516e88f229ea5cf31a5a3dab1e12b7c60bbd9e8004f5e7f6215678638ee9816ccbc4f87508b2a99352d1d2ca9b306 + checksum: 10c0/1252d908f89c5cb2c2166b283ec5e0d0d87f8c08552e7ab942744a4311d8e61a300877c24ff8d24e9f201a4b1a5dfdd390c807ef0f78a1d6b850d54dcae24dd9 languageName: node linkType: hard "@graphql-tools/load@npm:^8.0.1, @graphql-tools/load@npm:^8.0.7": - version: 8.0.12 - resolution: "@graphql-tools/load@npm:8.0.12" + version: 8.0.13 + resolution: "@graphql-tools/load@npm:8.0.13" dependencies: - "@graphql-tools/schema": "npm:^10.0.16" - "@graphql-tools/utils": "npm:^10.7.2" + "@graphql-tools/schema": "npm:^10.0.17" + "@graphql-tools/utils": "npm:^10.8.0" p-limit: "npm:3.1.0" tslib: "npm:^2.4.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/02f030c17ea83429491a125b32b7b99d3a2583cbd2bdcfeb24561501d7b48332bb274558704363115230075fc79816210a6ff3ad825a45639a257ed11d37361c + checksum: 10c0/425d3bbe1d5e13e1af64a8ced33747619b4de27d1ab3f1b9e7b12243b93901698b716397b88705e3abf66beb3808b2c7968b752821d224fedcbb50246e619937 languageName: node linkType: hard @@ -4285,15 +4285,15 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/merge@npm:^9.0.12, @graphql-tools/merge@npm:^9.0.17": - version: 9.0.17 - resolution: "@graphql-tools/merge@npm:9.0.17" +"@graphql-tools/merge@npm:^9.0.12, @graphql-tools/merge@npm:^9.0.18": + version: 9.0.18 + resolution: "@graphql-tools/merge@npm:9.0.18" dependencies: - "@graphql-tools/utils": "npm:^10.7.2" + "@graphql-tools/utils": "npm:^10.8.0" tslib: "npm:^2.4.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/5dc25bd8875adaa0c4c3efb928f514b8828b36b71aaba4aeef02c36975e6ab897168e9370b0955ad6c569d3671cea1c84b4c54646ae3287992f458641deea8a2 + checksum: 10c0/1c74f42efa5e0ce9c5a7fc94147d32d14917efdf28fa2eeef62482f63ee79b9b6e32d42bd2b46bc0c3c818cd834567ba15441fdad674ccdc9bb42d13337a8cef languageName: node linkType: hard @@ -4311,17 +4311,16 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/schema@npm:^10.0.11, @graphql-tools/schema@npm:^10.0.16, @graphql-tools/schema@npm:^10.0.5": - version: 10.0.16 - resolution: "@graphql-tools/schema@npm:10.0.16" +"@graphql-tools/schema@npm:^10.0.11, @graphql-tools/schema@npm:^10.0.16, @graphql-tools/schema@npm:^10.0.17, @graphql-tools/schema@npm:^10.0.5": + version: 10.0.17 + resolution: "@graphql-tools/schema@npm:10.0.17" dependencies: - "@graphql-tools/merge": "npm:^9.0.17" - "@graphql-tools/utils": "npm:^10.7.2" + "@graphql-tools/merge": "npm:^9.0.18" + "@graphql-tools/utils": "npm:^10.8.0" tslib: "npm:^2.4.0" - value-or-promise: "npm:^1.0.12" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/b783c9a3d8d7d77d659bffcee0e981e9a3755401bd5149d1c1ad53b6e9975eefd841b94768df2b17a02edfa78e1bd5494d08a365a5bb801174b8c09012932a3d + checksum: 10c0/5d05000f2b38ebe46ed443ba40888c970e1fea931fe8ff73188b5ed18015db129d9cdc2a59fb4dda4644ed36e4155ea29758fca680a7647d1b1972ddf1e0d419 languageName: node linkType: hard @@ -4362,7 +4361,7 @@ __metadata: "@graphql-tools/executor": "npm:^1.3.10" "@graphql-tools/merge": "npm:^9.0.12" "@graphql-tools/schema": "npm:^10.0.11" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" "@graphql-tools/wrap": "workspace:^" dataloader: "npm:^2.2.3" graphql: "npm:^16.9.0" @@ -4379,7 +4378,7 @@ __metadata: dependencies: "@graphql-tools/delegate": "workspace:^" "@graphql-tools/schema": "npm:^10.0.11" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" graphql: "npm:^16.9.0" pkgroll: "npm:2.8.2" tslib: "npm:^2.8.1" @@ -4399,9 +4398,23 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.3, @graphql-tools/utils@npm:^10.5.1, @graphql-tools/utils@npm:^10.5.4, @graphql-tools/utils@npm:^10.6.0, @graphql-tools/utils@npm:^10.6.1, @graphql-tools/utils@npm:^10.6.2, @graphql-tools/utils@npm:^10.6.4, @graphql-tools/utils@npm:^10.7.0, @graphql-tools/utils@npm:^10.7.2": - version: 10.7.2 - resolution: "@graphql-tools/utils@npm:10.7.2" +"@graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.3, @graphql-tools/utils@npm:^10.5.1, @graphql-tools/utils@npm:^10.5.4, @graphql-tools/utils@npm:^10.6.0, @graphql-tools/utils@npm:^10.6.1, @graphql-tools/utils@npm:^10.6.2, @graphql-tools/utils@npm:^10.6.4, @graphql-tools/utils@npm:^10.7.2, @graphql-tools/utils@npm:^10.8.0": + version: 10.8.0 + resolution: "@graphql-tools/utils@npm:10.8.0" + dependencies: + "@graphql-typed-document-node/core": "npm:^3.1.1" + cross-inspect: "npm:1.0.1" + dset: "npm:^3.1.4" + tslib: "npm:^2.4.0" + peerDependencies: + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 + checksum: 10c0/2bfc3b0ef4f00168a4ee6405c482318008ba020cccf6ecd833aff425f1099ec91480158ddef418ca89a11df5aa917ef37410abbb10619c64b84aae342928e778 + languageName: node + linkType: hard + +"@graphql-tools/utils@npm:^10.8.1": + version: 10.8.1 + resolution: "@graphql-tools/utils@npm:10.8.1" dependencies: "@graphql-typed-document-node/core": "npm:^3.1.1" cross-inspect: "npm:1.0.1" @@ -4409,7 +4422,7 @@ __metadata: tslib: "npm:^2.4.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/1e73eaf482437e2d20c1241d3fd422587a7cba93bc67d1572974053788fda22cca745f2e3048150a0af5b0cd9132b7ee49b661ada7a4a0e40e4732afcb53c549 + checksum: 10c0/c3011af1f7de800f7044721ce52bb709edda5aaf71b7734a4b1a2169485f61ca7d400534671c48eaeedc0a2e7b3cacecc5c0c81c84d8c3872dc442500cf4a959 languageName: node linkType: hard @@ -4455,7 +4468,7 @@ __metadata: dependencies: "@graphql-tools/delegate": "workspace:^" "@graphql-tools/schema": "npm:^10.0.11" - "@graphql-tools/utils": "npm:^10.7.0" + "@graphql-tools/utils": "npm:^10.8.1" graphql: "npm:^16.9.0" pkgroll: "npm:2.8.2" tslib: "npm:^2.8.1"