diff --git a/.changeset/@graphql-mesh_apollo-link-7477-dependencies.md b/.changeset/@graphql-mesh_apollo-link-7477-dependencies.md new file mode 100644 index 0000000000000..469394eb22a68 --- /dev/null +++ b/.changeset/@graphql-mesh_apollo-link-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/apollo-link": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_cli-7477-dependencies.md b/.changeset/@graphql-mesh_cli-7477-dependencies.md new file mode 100644 index 0000000000000..96971d1f8a3fe --- /dev/null +++ b/.changeset/@graphql-mesh_cli-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/cli": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_compose-cli-7477-dependencies.md b/.changeset/@graphql-mesh_compose-cli-7477-dependencies.md new file mode 100644 index 0000000000000..988763cc7e825 --- /dev/null +++ b/.changeset/@graphql-mesh_compose-cli-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/compose-cli": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_config-7477-dependencies.md b/.changeset/@graphql-mesh_config-7477-dependencies.md new file mode 100644 index 0000000000000..b39c44433d606 --- /dev/null +++ b/.changeset/@graphql-mesh_config-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/config": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_cross-helpers-7477-dependencies.md b/.changeset/@graphql-mesh_cross-helpers-7477-dependencies.md new file mode 100644 index 0000000000000..446e0c93bdc0f --- /dev/null +++ b/.changeset/@graphql-mesh_cross-helpers-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/cross-helpers": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_fusion-composition-7477-dependencies.md b/.changeset/@graphql-mesh_fusion-composition-7477-dependencies.md new file mode 100644 index 0000000000000..9daebb788acb2 --- /dev/null +++ b/.changeset/@graphql-mesh_fusion-composition-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/fusion-composition": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.3.2`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_fusion-runtime-7477-dependencies.md b/.changeset/@graphql-mesh_fusion-runtime-7477-dependencies.md new file mode 100644 index 0000000000000..bc4ea1616dd25 --- /dev/null +++ b/.changeset/@graphql-mesh_fusion-runtime-7477-dependencies.md @@ -0,0 +1,7 @@ +--- +"@graphql-mesh/fusion-runtime": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/executor@^1.3.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor/v/1.3.1) (from `^1.3.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_graphql-7477-dependencies.md b/.changeset/@graphql-mesh_graphql-7477-dependencies.md new file mode 100644 index 0000000000000..23f92fd7f68f5 --- /dev/null +++ b/.changeset/@graphql-mesh_graphql-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/graphql": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_grpc-7477-dependencies.md b/.changeset/@graphql-mesh_grpc-7477-dependencies.md new file mode 100644 index 0000000000000..8ee63990e3180 --- /dev/null +++ b/.changeset/@graphql-mesh_grpc-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/grpc": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_http-7477-dependencies.md b/.changeset/@graphql-mesh_http-7477-dependencies.md new file mode 100644 index 0000000000000..c72475dcd095e --- /dev/null +++ b/.changeset/@graphql-mesh_http-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/http": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_merger-bare-7477-dependencies.md b/.changeset/@graphql-mesh_merger-bare-7477-dependencies.md new file mode 100644 index 0000000000000..1a85b64f1663c --- /dev/null +++ b/.changeset/@graphql-mesh_merger-bare-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/merger-bare": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_merger-federation-7477-dependencies.md b/.changeset/@graphql-mesh_merger-federation-7477-dependencies.md new file mode 100644 index 0000000000000..8e79aa0b7c261 --- /dev/null +++ b/.changeset/@graphql-mesh_merger-federation-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/merger-federation": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) + - Added dependency [`@graphql-tools/executor@^1.3.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor/v/1.3.1) (to `peerDependencies`) diff --git a/.changeset/@graphql-mesh_merger-stitching-7477-dependencies.md b/.changeset/@graphql-mesh_merger-stitching-7477-dependencies.md new file mode 100644 index 0000000000000..b17672d21db4b --- /dev/null +++ b/.changeset/@graphql-mesh_merger-stitching-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/merger-stitching": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_mysql-7477-dependencies.md b/.changeset/@graphql-mesh_mysql-7477-dependencies.md new file mode 100644 index 0000000000000..526a978c38085 --- /dev/null +++ b/.changeset/@graphql-mesh_mysql-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/mysql": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_odata-7477-dependencies.md b/.changeset/@graphql-mesh_odata-7477-dependencies.md new file mode 100644 index 0000000000000..83802e9155b13 --- /dev/null +++ b/.changeset/@graphql-mesh_odata-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/odata": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_plugin-mock-7477-dependencies.md b/.changeset/@graphql-mesh_plugin-mock-7477-dependencies.md new file mode 100644 index 0000000000000..869f758dc6b99 --- /dev/null +++ b/.changeset/@graphql-mesh_plugin-mock-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/plugin-mock": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_plugin-opentelemetry-7477-dependencies.md b/.changeset/@graphql-mesh_plugin-opentelemetry-7477-dependencies.md new file mode 100644 index 0000000000000..19317571e3b62 --- /dev/null +++ b/.changeset/@graphql-mesh_plugin-opentelemetry-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/plugin-opentelemetry": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_plugin-rate-limit-7477-dependencies.md b/.changeset/@graphql-mesh_plugin-rate-limit-7477-dependencies.md new file mode 100644 index 0000000000000..e3a6604cec9be --- /dev/null +++ b/.changeset/@graphql-mesh_plugin-rate-limit-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/plugin-rate-limit": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_postgraphile-7477-dependencies.md b/.changeset/@graphql-mesh_postgraphile-7477-dependencies.md new file mode 100644 index 0000000000000..a4e2f82e10ef9 --- /dev/null +++ b/.changeset/@graphql-mesh_postgraphile-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/postgraphile": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_runtime-7477-dependencies.md b/.changeset/@graphql-mesh_runtime-7477-dependencies.md new file mode 100644 index 0000000000000..dc0bac515232a --- /dev/null +++ b/.changeset/@graphql-mesh_runtime-7477-dependencies.md @@ -0,0 +1,7 @@ +--- +"@graphql-mesh/runtime": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/executor@^1.3.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor/v/1.3.1) (from `^1.3.0`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_serve-cli-7477-dependencies.md b/.changeset/@graphql-mesh_serve-cli-7477-dependencies.md new file mode 100644 index 0000000000000..f088d6f65c096 --- /dev/null +++ b/.changeset/@graphql-mesh_serve-cli-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/serve-cli": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_serve-runtime-7477-dependencies.md b/.changeset/@graphql-mesh_serve-runtime-7477-dependencies.md new file mode 100644 index 0000000000000..de184c147247a --- /dev/null +++ b/.changeset/@graphql-mesh_serve-runtime-7477-dependencies.md @@ -0,0 +1,7 @@ +--- +"@graphql-mesh/serve-runtime": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) + - Removed dependency [`@graphql-tools/executor-yoga@^3.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor-yoga/v/3.0.0) (from `dependencies`) diff --git a/.changeset/@graphql-mesh_soap-7477-dependencies.md b/.changeset/@graphql-mesh_soap-7477-dependencies.md new file mode 100644 index 0000000000000..dfb6075cd1bb8 --- /dev/null +++ b/.changeset/@graphql-mesh_soap-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/soap": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_store-7477-dependencies.md b/.changeset/@graphql-mesh_store-7477-dependencies.md new file mode 100644 index 0000000000000..587bf7a648434 --- /dev/null +++ b/.changeset/@graphql-mesh_store-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/store": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_thrift-7477-dependencies.md b/.changeset/@graphql-mesh_thrift-7477-dependencies.md new file mode 100644 index 0000000000000..0949283748325 --- /dev/null +++ b/.changeset/@graphql-mesh_thrift-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/thrift": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-cache-7477-dependencies.md b/.changeset/@graphql-mesh_transform-cache-7477-dependencies.md new file mode 100644 index 0000000000000..eabd2e59c193b --- /dev/null +++ b/.changeset/@graphql-mesh_transform-cache-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transform-cache": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-encapsulate-7477-dependencies.md b/.changeset/@graphql-mesh_transform-encapsulate-7477-dependencies.md new file mode 100644 index 0000000000000..95db92ea11998 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-encapsulate-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transform-encapsulate": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-extend-7477-dependencies.md b/.changeset/@graphql-mesh_transform-extend-7477-dependencies.md new file mode 100644 index 0000000000000..42317d90d2934 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-extend-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transform-extend": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-federation-7477-dependencies.md b/.changeset/@graphql-mesh_transform-federation-7477-dependencies.md new file mode 100644 index 0000000000000..46f3cb9a25659 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-federation-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transform-federation": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-filter-schema-7477-dependencies.md b/.changeset/@graphql-mesh_transform-filter-schema-7477-dependencies.md new file mode 100644 index 0000000000000..a717f50231925 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-filter-schema-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transform-filter-schema": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-hive-7477-dependencies.md b/.changeset/@graphql-mesh_transform-hive-7477-dependencies.md new file mode 100644 index 0000000000000..3c13d3c3989c2 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-hive-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transform-hive": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-hoist-field-7477-dependencies.md b/.changeset/@graphql-mesh_transform-hoist-field-7477-dependencies.md new file mode 100644 index 0000000000000..781c5ef7580eb --- /dev/null +++ b/.changeset/@graphql-mesh_transform-hoist-field-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transform-hoist-field": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-naming-convention-7477-dependencies.md b/.changeset/@graphql-mesh_transform-naming-convention-7477-dependencies.md new file mode 100644 index 0000000000000..49b9a0d3496d3 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-naming-convention-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transform-naming-convention": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-prefix-7477-dependencies.md b/.changeset/@graphql-mesh_transform-prefix-7477-dependencies.md new file mode 100644 index 0000000000000..e6a01283a86e6 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-prefix-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transform-prefix": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-prune-7477-dependencies.md b/.changeset/@graphql-mesh_transform-prune-7477-dependencies.md new file mode 100644 index 0000000000000..2f4f4c4242c88 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-prune-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transform-prune": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-rate-limit-7477-dependencies.md b/.changeset/@graphql-mesh_transform-rate-limit-7477-dependencies.md new file mode 100644 index 0000000000000..00a8820840754 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-rate-limit-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transform-rate-limit": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-rename-7477-dependencies.md b/.changeset/@graphql-mesh_transform-rename-7477-dependencies.md new file mode 100644 index 0000000000000..a017db679da6f --- /dev/null +++ b/.changeset/@graphql-mesh_transform-rename-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transform-rename": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-replace-field-7477-dependencies.md b/.changeset/@graphql-mesh_transform-replace-field-7477-dependencies.md new file mode 100644 index 0000000000000..07baed5e41b39 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-replace-field-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transform-replace-field": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-transfer-schema-7477-dependencies.md b/.changeset/@graphql-mesh_transform-transfer-schema-7477-dependencies.md new file mode 100644 index 0000000000000..dd79b30a5cc88 --- /dev/null +++ b/.changeset/@graphql-mesh_transform-transfer-schema-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transform-transfer-schema": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transform-type-merging-7477-dependencies.md b/.changeset/@graphql-mesh_transform-type-merging-7477-dependencies.md new file mode 100644 index 0000000000000..d5db58b35052b --- /dev/null +++ b/.changeset/@graphql-mesh_transform-type-merging-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transform-type-merging": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-common-7477-dependencies.md b/.changeset/@graphql-mesh_transport-common-7477-dependencies.md new file mode 100644 index 0000000000000..a70c6dc997f6d --- /dev/null +++ b/.changeset/@graphql-mesh_transport-common-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transport-common": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-http-7477-dependencies.md b/.changeset/@graphql-mesh_transport-http-7477-dependencies.md new file mode 100644 index 0000000000000..e5bbf58f3d386 --- /dev/null +++ b/.changeset/@graphql-mesh_transport-http-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transport-http": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-http-callback-7477-dependencies.md b/.changeset/@graphql-mesh_transport-http-callback-7477-dependencies.md new file mode 100644 index 0000000000000..562740a6cd441 --- /dev/null +++ b/.changeset/@graphql-mesh_transport-http-callback-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transport-http-callback": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-mysql-7477-dependencies.md b/.changeset/@graphql-mesh_transport-mysql-7477-dependencies.md new file mode 100644 index 0000000000000..66bc44bdfd41a --- /dev/null +++ b/.changeset/@graphql-mesh_transport-mysql-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transport-mysql": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-neo4j-7477-dependencies.md b/.changeset/@graphql-mesh_transport-neo4j-7477-dependencies.md new file mode 100644 index 0000000000000..e7f796985ab38 --- /dev/null +++ b/.changeset/@graphql-mesh_transport-neo4j-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transport-neo4j": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-rest-7477-dependencies.md b/.changeset/@graphql-mesh_transport-rest-7477-dependencies.md new file mode 100644 index 0000000000000..063635d072701 --- /dev/null +++ b/.changeset/@graphql-mesh_transport-rest-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transport-rest": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transport-soap-7477-dependencies.md b/.changeset/@graphql-mesh_transport-soap-7477-dependencies.md new file mode 100644 index 0000000000000..2297ff1cc78c1 --- /dev/null +++ b/.changeset/@graphql-mesh_transport-soap-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/transport-soap": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) + - Added dependency [`@graphql-tools/executor@^1.3.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor/v/1.3.1) (to `peerDependencies`) diff --git a/.changeset/@graphql-mesh_transport-thrift-7477-dependencies.md b/.changeset/@graphql-mesh_transport-thrift-7477-dependencies.md new file mode 100644 index 0000000000000..0bddac4df9b77 --- /dev/null +++ b/.changeset/@graphql-mesh_transport-thrift-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transport-thrift": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_transport-ws-7477-dependencies.md b/.changeset/@graphql-mesh_transport-ws-7477-dependencies.md new file mode 100644 index 0000000000000..203a409dbf68d --- /dev/null +++ b/.changeset/@graphql-mesh_transport-ws-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/transport-ws": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_types-7477-dependencies.md b/.changeset/@graphql-mesh_types-7477-dependencies.md new file mode 100644 index 0000000000000..d10291feb9dea --- /dev/null +++ b/.changeset/@graphql-mesh_types-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/types": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_urql-exchange-7477-dependencies.md b/.changeset/@graphql-mesh_urql-exchange-7477-dependencies.md new file mode 100644 index 0000000000000..aa404982ef6b9 --- /dev/null +++ b/.changeset/@graphql-mesh_urql-exchange-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/urql-exchange": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@graphql-mesh_utils-7477-dependencies.md b/.changeset/@graphql-mesh_utils-7477-dependencies.md new file mode 100644 index 0000000000000..30af534546b76 --- /dev/null +++ b/.changeset/@graphql-mesh_utils-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/utils": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@omnigraph_json-schema-7477-dependencies.md b/.changeset/@omnigraph_json-schema-7477-dependencies.md new file mode 100644 index 0000000000000..a7797bcdb83b6 --- /dev/null +++ b/.changeset/@omnigraph_json-schema-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@omnigraph/json-schema": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@omnigraph_mysql-7477-dependencies.md b/.changeset/@omnigraph_mysql-7477-dependencies.md new file mode 100644 index 0000000000000..d52270fe6a1fe --- /dev/null +++ b/.changeset/@omnigraph_mysql-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@omnigraph/mysql": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `dependencies`) diff --git a/.changeset/@omnigraph_neo4j-7477-dependencies.md b/.changeset/@omnigraph_neo4j-7477-dependencies.md new file mode 100644 index 0000000000000..e4ab5096081df --- /dev/null +++ b/.changeset/@omnigraph_neo4j-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@omnigraph/neo4j": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) diff --git a/.changeset/@omnigraph_openapi-7477-dependencies.md b/.changeset/@omnigraph_openapi-7477-dependencies.md new file mode 100644 index 0000000000000..7c51cd4e8b454 --- /dev/null +++ b/.changeset/@omnigraph_openapi-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@omnigraph/openapi": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) diff --git a/.changeset/@omnigraph_raml-7477-dependencies.md b/.changeset/@omnigraph_raml-7477-dependencies.md new file mode 100644 index 0000000000000..4d2a6eca13fd9 --- /dev/null +++ b/.changeset/@omnigraph_raml-7477-dependencies.md @@ -0,0 +1,6 @@ +--- +"@omnigraph/raml": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@omnigraph_soap-7477-dependencies.md b/.changeset/@omnigraph_soap-7477-dependencies.md new file mode 100644 index 0000000000000..d9b08ee2a64a3 --- /dev/null +++ b/.changeset/@omnigraph_soap-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@omnigraph/soap": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/utils@^10.3.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.4) (from `^10.2.3`, in `peerDependencies`) diff --git a/.changeset/@omnigraph_sqlite-7477-dependencies.md b/.changeset/@omnigraph_sqlite-7477-dependencies.md new file mode 100644 index 0000000000000..6bc32415f2142 --- /dev/null +++ b/.changeset/@omnigraph_sqlite-7477-dependencies.md @@ -0,0 +1,5 @@ +--- +"@omnigraph/sqlite": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/delegate@^10.0.18` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.18) (from `^10.0.17`, in `dependencies`) diff --git a/packages/compose-cli/package.json b/packages/compose-cli/package.json index a858a192d9117..6b85d3d2c6008 100644 --- a/packages/compose-cli/package.json +++ b/packages/compose-cli/package.json @@ -46,7 +46,7 @@ "@graphql-tools/graphql-file-loader": "8.0.1", "@graphql-tools/load": "^8.0.1", "@graphql-tools/schema": "^10.0.4", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "@whatwg-node/fetch": "^0.9.14", "commander": "^12.0.0", "dotenv": "^16.3.1" diff --git a/packages/cross-helpers/package.json b/packages/cross-helpers/package.json index ebd554da118e2..ccdc7b669dca9 100644 --- a/packages/cross-helpers/package.json +++ b/packages/cross-helpers/package.json @@ -17,7 +17,7 @@ "types": "index.d.ts", "typings": "./index.d.ts", "peerDependencies": { - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*" }, "dependencies": { diff --git a/packages/fusion/composition/package.json b/packages/fusion/composition/package.json index ce66c28e0b799..20743943e1eb0 100644 --- a/packages/fusion/composition/package.json +++ b/packages/fusion/composition/package.json @@ -53,7 +53,7 @@ "@graphql-mesh/utils": "^0.99.7", "@graphql-tools/schema": "^10.0.4", "@graphql-tools/stitching-directives": "^3.1.2", - "@graphql-tools/utils": "^10.3.2", + "@graphql-tools/utils": "^10.3.4", "@theguild/federation-composition": "^0.12.0", "change-case": "^4.1.2", "graphql-scalars": "^1.23.0", diff --git a/packages/fusion/runtime/package.json b/packages/fusion/runtime/package.json index 5a4fe7e4bb95a..cc483d71d34fd 100644 --- a/packages/fusion/runtime/package.json +++ b/packages/fusion/runtime/package.json @@ -56,12 +56,12 @@ "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/delegate": "^10.0.17", - "@graphql-tools/executor": "^1.3.0", + "@graphql-tools/delegate": "^10.0.18", + "@graphql-tools/executor": "^1.3.1", "@graphql-tools/federation": "^2.2.4", "@graphql-tools/stitch": "^9.2.10", "@graphql-tools/stitching-directives": "^3.1.2", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "@graphql-tools/wrap": "^10.0.5", "@whatwg-node/disposablestack": "^0.0.1", "change-case": "^4.1.2", diff --git a/packages/fusion/runtime/src/utils.ts b/packages/fusion/runtime/src/utils.ts index 2ac95cd053494..742beccb43f42 100644 --- a/packages/fusion/runtime/src/utils.ts +++ b/packages/fusion/runtime/src/utils.ts @@ -282,9 +282,8 @@ export function wrapExecutorWithHooks({ return currentResult; } - const asyncIterator = currentResult[Symbol.asyncIterator](); return mapAsyncIterator( - asyncIterator, + currentResult, currentResult => mapMaybePromise( iterateAsync(onNextHooks, onNext => diff --git a/packages/fusion/runtime/tests/transforms/encapsulate.test.ts b/packages/fusion/runtime/tests/transforms/encapsulate.test.ts index c24399872e3b4..076cec31ff9a8 100644 --- a/packages/fusion/runtime/tests/transforms/encapsulate.test.ts +++ b/packages/fusion/runtime/tests/transforms/encapsulate.test.ts @@ -1,7 +1,8 @@ -import { execute, GraphQLSchema, parse, printSchema } from 'graphql'; +import { GraphQLSchema, parse } from 'graphql'; import { createEncapsulateTransform } from '@graphql-mesh/fusion-composition'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { printSchemaWithDirectives } from '@graphql-tools/utils'; +import { isAsyncIterable } from '@graphql-tools/utils'; import { Repeater } from '@repeaterjs/repeater'; import { composeAndGetExecutor, composeAndGetPublicSchema } from '../utils'; @@ -92,11 +93,14 @@ describe('encapsulate', () => { expect(newSchema.getQueryType().getFields().getSomething).not.toBeDefined(); }); it('executes queries the same way and preserves the execution flow', async () => { - const { data: resultBefore } = await execute({ + const resultBefore = await normalizedExecutor({ schema, document: parse(`{ getSomething }`), }); - expect(resultBefore.getSomething).toBe('boop'); + if (isAsyncIterable(resultBefore)) { + throw new Error('Expected a result, but got an async iterable'); + } + expect(resultBefore.data.getSomething).toBe('boop'); const transform = createEncapsulateTransform(); const executor = composeAndGetExecutor([ { diff --git a/packages/legacy/apollo-link/package.json b/packages/legacy/apollo-link/package.json index 5a2f0d842ec15..d94216f442908 100644 --- a/packages/legacy/apollo-link/package.json +++ b/packages/legacy/apollo-link/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@apollo/client": "^3.5.9", "@graphql-mesh/runtime": "^0.100.8", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "^15.2.0 || ^16.0.0", "tslib": "^2.4.0" }, diff --git a/packages/legacy/cli/package.json b/packages/legacy/cli/package.json index 9e8cb770bfad9..0a883afd4a54c 100644 --- a/packages/legacy/cli/package.json +++ b/packages/legacy/cli/package.json @@ -55,7 +55,7 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "ajv": "^8.12.0", "change-case": "^4.1.2", "cosmiconfig": "^9.0.0", diff --git a/packages/legacy/cli/src/commands/serve/getGraphQLWSOpts.ts b/packages/legacy/cli/src/commands/serve/getGraphQLWSOpts.ts index 940983598643d..3c96f79d1abb3 100644 --- a/packages/legacy/cli/src/commands/serve/getGraphQLWSOpts.ts +++ b/packages/legacy/cli/src/commands/serve/getGraphQLWSOpts.ts @@ -1,4 +1,5 @@ import type { execute, ExecutionArgs, subscribe } from 'graphql'; +import type { useServer } from 'graphql-ws/lib/use/ws'; import type { MeshInstance } from '@graphql-mesh/runtime'; export function getGraphQLWSOptions(getBuiltMesh: () => Promise) { @@ -11,8 +12,8 @@ export function getGraphQLWSOptions(getBuiltMesh: () => Promise) { }; }; return { - execute: args => (args as EnvelopedExecutionArgs).rootValue.execute(args), - subscribe: args => (args as EnvelopedExecutionArgs).rootValue.subscribe(args), + execute: (args: EnvelopedExecutionArgs) => args.rootValue.execute(args), + subscribe: (args: EnvelopedExecutionArgs) => args.rootValue.subscribe(args), onSubscribe: async (ctx, msg) => { const { getEnveloped } = await getBuiltMesh(); const { schema, execute, subscribe, contextFactory, parse, validate } = getEnveloped(ctx); @@ -33,5 +34,5 @@ export function getGraphQLWSOptions(getBuiltMesh: () => Promise) { if (errors.length) return errors; return args; }, - }; + } as Parameters[0]; } diff --git a/packages/legacy/config/package.json b/packages/legacy/config/package.json index 7bdd4a59db20f..368f129fc0806 100644 --- a/packages/legacy/config/package.json +++ b/packages/legacy/config/package.json @@ -37,7 +37,7 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/handlers/graphql/package.json b/packages/legacy/handlers/graphql/package.json index ab10ba981ddf5..fd979b0749be8 100644 --- a/packages/legacy/handlers/graphql/package.json +++ b/packages/legacy/handlers/graphql/package.json @@ -36,13 +36,13 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { "@graphql-mesh/string-interpolation": "^0.5.5", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/federation": "^2.2.4", "@graphql-tools/url-loader": "^8.0.0", "lodash.get": "^4.4.2" diff --git a/packages/legacy/handlers/grpc/package.json b/packages/legacy/handlers/grpc/package.json index 86255ea12ae83..4baaaf8c238fb 100644 --- a/packages/legacy/handlers/grpc/package.json +++ b/packages/legacy/handlers/grpc/package.json @@ -36,7 +36,7 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/handlers/json-schema/test/handler.spec.ts b/packages/legacy/handlers/json-schema/test/handler.spec.ts index 04e2fffbde75d..fd0eaf275e75b 100644 --- a/packages/legacy/handlers/json-schema/test/handler.spec.ts +++ b/packages/legacy/handlers/json-schema/test/handler.spec.ts @@ -1,8 +1,9 @@ /* eslint-disable import/no-extraneous-dependencies */ -import { execute, parse } from 'graphql'; +import { parse } from 'graphql'; import LocalforageCache from '@graphql-mesh/cache-localforage'; import { InMemoryStoreStorageAdapter, MeshStore } from '@graphql-mesh/store'; import { defaultImportFn, DefaultLogger, getHeadersObj, PubSub } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { Headers, Response } from '@whatwg-node/fetch'; import JsonSchemaHandler from '../src/index.js'; @@ -62,7 +63,7 @@ describe('JSON Schema Handler', () => { } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), }); diff --git a/packages/legacy/handlers/mysql/package.json b/packages/legacy/handlers/mysql/package.json index 2bb383078837e..3f6cbe38034a4 100644 --- a/packages/legacy/handlers/mysql/package.json +++ b/packages/legacy/handlers/mysql/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/handlers/odata/package.json b/packages/legacy/handlers/odata/package.json index 17f5433a1fa1d..22ed021cc5983 100644 --- a/packages/legacy/handlers/odata/package.json +++ b/packages/legacy/handlers/odata/package.json @@ -36,13 +36,13 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { "@graphql-mesh/string-interpolation": "^0.5.5", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@whatwg-node/fetch": "^0.9.0", "dataloader": "^2.2.2", "fast-xml-parser": "^4.2.1", diff --git a/packages/legacy/handlers/postgraphile/package.json b/packages/legacy/handlers/postgraphile/package.json index c30514dedc438..ab0b6081a7638 100644 --- a/packages/legacy/handlers/postgraphile/package.json +++ b/packages/legacy/handlers/postgraphile/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "@graphql-mesh/string-interpolation": "^0.5.5", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "pg": "^8.6.0", "postgraphile": "^4.13.0", "postgraphile-core": "^4.13.0" diff --git a/packages/legacy/handlers/soap/package.json b/packages/legacy/handlers/soap/package.json index e015274561684..ff346d8b0d3f0 100644 --- a/packages/legacy/handlers/soap/package.json +++ b/packages/legacy/handlers/soap/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/handlers/thrift/package.json b/packages/legacy/handlers/thrift/package.json index a6388503f4416..86631d668dcff 100644 --- a/packages/legacy/handlers/thrift/package.json +++ b/packages/legacy/handlers/thrift/package.json @@ -36,7 +36,7 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/http/package.json b/packages/legacy/http/package.json index 40870039687bb..b2e3322b63efd 100644 --- a/packages/legacy/http/package.json +++ b/packages/legacy/http/package.json @@ -36,7 +36,7 @@ "@graphql-mesh/runtime": "^0.100.8", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/mergers/bare/package.json b/packages/legacy/mergers/bare/package.json index 220ac8596c109..267f5cce9080d 100644 --- a/packages/legacy/mergers/bare/package.json +++ b/packages/legacy/mergers/bare/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/mergers/federation/package.json b/packages/legacy/mergers/federation/package.json index 3391f51f775dd..f21fe354f7b73 100644 --- a/packages/legacy/mergers/federation/package.json +++ b/packages/legacy/mergers/federation/package.json @@ -36,7 +36,8 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/executor": "^1.3.1", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/mergers/federation/src/index.ts b/packages/legacy/mergers/federation/src/index.ts index 349685790a9e3..2d71d09b684c2 100644 --- a/packages/legacy/mergers/federation/src/index.ts +++ b/packages/legacy/mergers/federation/src/index.ts @@ -1,5 +1,5 @@ import type { DocumentNode, ExecutionResult, GraphQLSchema } from 'graphql'; -import { execute, extendSchema, parse } from 'graphql'; +import { extendSchema, parse } from 'graphql'; import { ApolloGateway, LocalGraphQLDataSource, SERVICE_DEFINITION_QUERY } from '@apollo/gateway'; import { process } from '@graphql-mesh/cross-helpers'; import type { MeshStore } from '@graphql-mesh/store'; @@ -14,9 +14,10 @@ import type { RawSourceOutput, } from '@graphql-mesh/types'; import { printWithCache } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { addResolversToSchema } from '@graphql-tools/schema'; import type { ExecutionRequest } from '@graphql-tools/utils'; -import { asArray, printSchemaWithDirectives } from '@graphql-tools/utils'; +import { asArray, isAsyncIterable, printSchemaWithDirectives } from '@graphql-tools/utils'; import { wrapSchema } from '@graphql-tools/wrap'; export default class FederationMerger implements MeshMerger { @@ -46,10 +47,13 @@ export default class FederationMerger implements MeshMerger { .proxy(`${rawSource.name}_sdl`, PredefinedProxyOptions.StringWithoutValidation) .getWithSet(async () => { this.logger.debug(`Fetching Apollo Federated Service SDL for ${rawSource.name}`); - const sdlQueryResult: any = await execute({ + const sdlQueryResult = await normalizedExecutor({ schema: transformedSchema, document: parse(SERVICE_DEFINITION_QUERY), }); + if (isAsyncIterable(sdlQueryResult)) { + throw new Error('Expected a result, but got an async iterable'); + } if (sdlQueryResult.errors?.length) { throw new AggregateError( sdlQueryResult.errors, diff --git a/packages/legacy/mergers/stitching/package.json b/packages/legacy/mergers/stitching/package.json index 3d05ab8165d27..c2c16802e8e43 100644 --- a/packages/legacy/mergers/stitching/package.json +++ b/packages/legacy/mergers/stitching/package.json @@ -35,12 +35,12 @@ "@graphql-mesh/store": "^0.99.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/schema": "^10.0.0", "@graphql-tools/stitch": "^9.2.10" }, diff --git a/packages/legacy/runtime/package.json b/packages/legacy/runtime/package.json index e70a0a6209a8e..46c1a189d9e2d 100644 --- a/packages/legacy/runtime/package.json +++ b/packages/legacy/runtime/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, @@ -45,8 +45,8 @@ "@envelop/graphql-jit": "^8.0.0", "@graphql-mesh/string-interpolation": "^0.5.5", "@graphql-tools/batch-delegate": "^9.0.3", - "@graphql-tools/delegate": "^10.0.17", - "@graphql-tools/executor": "^1.3.0", + "@graphql-tools/delegate": "^10.0.18", + "@graphql-tools/executor": "^1.3.1", "@graphql-tools/wrap": "^10.0.5", "@whatwg-node/fetch": "^0.9.0", "graphql-jit": "0.8.6" diff --git a/packages/legacy/runtime/src/get-mesh.ts b/packages/legacy/runtime/src/get-mesh.ts index 49579b2f7ea7a..108e396bff5fb 100644 --- a/packages/legacy/runtime/src/get-mesh.ts +++ b/packages/legacy/runtime/src/get-mesh.ts @@ -378,7 +378,7 @@ export async function getMesh(options: GetMeshOptions): Promise { return function sdkRequester(...args) { return mapMaybePromise(executor(...args), function handleExecutorResultForSdk(result) { if (isAsyncIterable(result)) { - return mapAsyncIterator(result as AsyncIterableIterator, extractDataOrThrowErrors); + return mapAsyncIterator(result, extractDataOrThrowErrors); } return extractDataOrThrowErrors(result); }); diff --git a/packages/legacy/runtime/src/useSubschema.ts b/packages/legacy/runtime/src/useSubschema.ts index 73360252af3c6..7fc78363b5d20 100644 --- a/packages/legacy/runtime/src/useSubschema.ts +++ b/packages/legacy/runtime/src/useSubschema.ts @@ -1,5 +1,5 @@ import type { DocumentNode, FieldNode, OperationDefinitionNode } from 'graphql'; -import { BREAK, execute, visit } from 'graphql'; +import { BREAK, visit } from 'graphql'; import type { CompiledQuery } from 'graphql-jit'; import { compileQuery, isCompiledQuery } from 'graphql-jit'; import type { Plugin, TypedExecutionArgs } from '@envelop/core'; @@ -12,6 +12,7 @@ import { } from '@graphql-mesh/utils'; import type { DelegationContext, Subschema } from '@graphql-tools/delegate'; import { applySchemaTransforms, createDefaultExecutor } from '@graphql-tools/delegate'; +import { normalizedExecutor } from '@graphql-tools/executor'; import type { ExecutionRequest, ExecutionResult, @@ -82,7 +83,7 @@ function getExecuteFn(subschema: Subschema) { }; return executionResult; } else if (introspectionQueryType === IntrospectionQueryType.REGULAR) { - return execute(args); + return normalizedExecutor(args); } const isStream = introspectionQueryType === IntrospectionQueryType.STREAM; const delegationContext: DelegationContext = { diff --git a/packages/legacy/store/package.json b/packages/legacy/store/package.json index 11eb7ca9c4b70..3eb978186329d 100644 --- a/packages/legacy/store/package.json +++ b/packages/legacy/store/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/transforms/cache/package.json b/packages/legacy/transforms/cache/package.json index a2c80681c310b..684c827e2a266 100644 --- a/packages/legacy/transforms/cache/package.json +++ b/packages/legacy/transforms/cache/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/transforms/encapsulate/package.json b/packages/legacy/transforms/encapsulate/package.json index 4c30da7ad9d56..f948b7bb83495 100644 --- a/packages/legacy/transforms/encapsulate/package.json +++ b/packages/legacy/transforms/encapsulate/package.json @@ -34,12 +34,12 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/wrap": "^10.0.5" }, "devDependencies": { diff --git a/packages/legacy/transforms/encapsulate/test/encapsulate.spec.ts b/packages/legacy/transforms/encapsulate/test/encapsulate.spec.ts index d8c2d73faf08e..293ef2f2030c7 100644 --- a/packages/legacy/transforms/encapsulate/test/encapsulate.spec.ts +++ b/packages/legacy/transforms/encapsulate/test/encapsulate.spec.ts @@ -1,10 +1,11 @@ -import { execute, getIntrospectionQuery, parse, subscribe } from 'graphql'; +import { getIntrospectionQuery, parse } from 'graphql'; import { envelop } from '@envelop/core'; import InMemoryLRUCache from '@graphql-mesh/cache-localforage'; import { useSubschema } from '@graphql-mesh/runtime'; import type { ImportFn, MeshPubSub } from '@graphql-mesh/types'; import { DefaultLogger, PubSub } from '@graphql-mesh/utils'; import { Subschema } from '@graphql-tools/delegate'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { isAsyncIterable } from '@graphql-tools/utils'; import { wrapSchema } from '@graphql-tools/wrap'; @@ -128,11 +129,14 @@ describe('encapsulate', () => { }); it('should execute queries the same way and preserve execution flow', async () => { - const { data: resultBefore } = await execute({ + const resultBefore = await normalizedExecutor({ schema, document: parse(`{ getSomething }`), }); - expect(resultBefore.getSomething).toBe('boop'); + if (isAsyncIterable(resultBefore)) { + throw new Error('Query did not return ExecutionResult'); + } + expect(resultBefore.data.getSomething).toBe('boop'); const newSchema = wrapSchema({ schema, @@ -149,20 +153,27 @@ describe('encapsulate', () => { ], }); - const { data: resultAfter }: any = await execute({ + const resultAfter = await normalizedExecutor({ schema: newSchema, document: parse(`{ test { getSomething } }`), }); - expect(resultAfter.test.getSomething).toBe('boop'); + if (isAsyncIterable(resultAfter)) { + throw new Error('Query did not return ExecutionResult'); + } + + expect(resultAfter.data.test.getSomething).toBe('boop'); }); it('should execute mutations the same way and preserve execution flow', async () => { - const { data: resultBefore } = await execute({ + const resultBefore = await normalizedExecutor({ schema, document: parse(`mutation { doSomething }`), }); - expect(resultBefore.doSomething).toBe('noop'); + if (isAsyncIterable(resultBefore)) { + throw new Error('Query did not return ExecutionResult'); + } + expect(resultBefore.data.doSomething).toBe('noop'); const newSchema = wrapSchema({ schema, @@ -179,7 +190,7 @@ describe('encapsulate', () => { ], }); - const { data: resultAfter }: any = await execute({ + const { data: resultAfter }: any = await normalizedExecutor({ schema: newSchema, document: parse(`mutation { test { doSomething } }`), }); @@ -217,12 +228,15 @@ describe('encapsulate', () => { ], }); - const { data } = await execute({ + const result = await normalizedExecutor({ schema: newSchema, document: parse(getIntrospectionQuery()), }); - expect(data).not.toBeNull(); + if (isAsyncIterable(result)) { + throw new Error('Query did not return ExecutionResult'); + } + expect(result.data).not.toBeNull(); }); const customSchema = makeExecutableSchema({ @@ -353,7 +367,7 @@ describe('encapsulate', () => { ], }); - const result = (await subscribe({ + const result = await normalizedExecutor({ schema: newSchema, document: parse(/* GraphQL */ ` subscription { @@ -362,7 +376,7 @@ describe('encapsulate', () => { } } `), - })) as AsyncIterable; + }); if (!isAsyncIterable(result)) { throw new Error('Subscription did not return AsyncIterable'); diff --git a/packages/legacy/transforms/extend/package.json b/packages/legacy/transforms/extend/package.json index d4fa6dc62b3e0..16cf49c229b53 100644 --- a/packages/legacy/transforms/extend/package.json +++ b/packages/legacy/transforms/extend/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/transforms/federation/package.json b/packages/legacy/transforms/federation/package.json index f6a30755fe94c..b2be83c1f2a17 100644 --- a/packages/legacy/transforms/federation/package.json +++ b/packages/legacy/transforms/federation/package.json @@ -34,14 +34,14 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { "@apollo/subgraph": "^2.4.1", "@graphql-mesh/string-interpolation": "^0.5.5", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/stitching-directives": "^3.1.2", "dset": "^3.1.2", "graphql-transform-federation": "^2.2.0" diff --git a/packages/legacy/transforms/filter-schema/package.json b/packages/legacy/transforms/filter-schema/package.json index 158459c6f54b4..2113aefcd32ba 100644 --- a/packages/legacy/transforms/filter-schema/package.json +++ b/packages/legacy/transforms/filter-schema/package.json @@ -34,12 +34,12 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/wrap": "^10.0.5", "minimatch": "^10.0.0" }, diff --git a/packages/legacy/transforms/hive/package.json b/packages/legacy/transforms/hive/package.json index ff673856a93a5..1a4f4f7981459 100644 --- a/packages/legacy/transforms/hive/package.json +++ b/packages/legacy/transforms/hive/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, @@ -42,7 +42,7 @@ "@graphql-hive/core": "^0.6.0", "@graphql-hive/yoga": "^0.34.0", "@graphql-mesh/string-interpolation": "^0.5.5", - "@graphql-tools/delegate": "^10.0.17" + "@graphql-tools/delegate": "^10.0.18" }, "publishConfig": { "access": "public", diff --git a/packages/legacy/transforms/hoist-field/package.json b/packages/legacy/transforms/hoist-field/package.json index 4acbe1b797600..29f8434cc907c 100644 --- a/packages/legacy/transforms/hoist-field/package.json +++ b/packages/legacy/transforms/hoist-field/package.json @@ -34,11 +34,11 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/wrap": "^10.0.5" }, "devDependencies": { diff --git a/packages/legacy/transforms/naming-convention/package.json b/packages/legacy/transforms/naming-convention/package.json index 51b140eddf6e3..b32209e66f9dc 100644 --- a/packages/legacy/transforms/naming-convention/package.json +++ b/packages/legacy/transforms/naming-convention/package.json @@ -34,12 +34,12 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.5.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/wrap": "^10.0.5", "change-case": "^4.1.2", "graphql-scalars": "^1.22.4", diff --git a/packages/legacy/transforms/prefix/package.json b/packages/legacy/transforms/prefix/package.json index 663557d0b72ad..47d43e7eb2922 100644 --- a/packages/legacy/transforms/prefix/package.json +++ b/packages/legacy/transforms/prefix/package.json @@ -34,12 +34,12 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/wrap": "^10.0.5", "graphql-scalars": "^1.22.4" }, diff --git a/packages/legacy/transforms/prefix/test/prefix.spec.ts b/packages/legacy/transforms/prefix/test/prefix.spec.ts index 7d42e01bce4cf..6c3e7264a5533 100644 --- a/packages/legacy/transforms/prefix/test/prefix.spec.ts +++ b/packages/legacy/transforms/prefix/test/prefix.spec.ts @@ -1,7 +1,8 @@ -import { execute, GraphQLObjectType, GraphQLSchema, parse, printSchema } from 'graphql'; +import { GraphQLObjectType, GraphQLSchema, parse, printSchema } from 'graphql'; import InMemoryLRUCache from '@graphql-mesh/cache-localforage'; import type { MeshPubSub } from '@graphql-mesh/types'; import { DefaultLogger, PubSub } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { describeTransformerTests } from '../../../testing/describeTransformerTests.js'; import PrefixTransform from '../src/index.js'; @@ -287,7 +288,7 @@ describeTransformerTests('prefix', ({ mode, transformSchema }) => { }), ); - const result = await execute({ + const result = await normalizedExecutor({ schema: newSchema, document: parse(/* GraphQL */ ` query { diff --git a/packages/legacy/transforms/prune/package.json b/packages/legacy/transforms/prune/package.json index 552f24510da37..ffcf11bf69e24 100644 --- a/packages/legacy/transforms/prune/package.json +++ b/packages/legacy/transforms/prune/package.json @@ -33,7 +33,7 @@ "typings": "dist/typings/index.d.ts", "peerDependencies": { "@graphql-mesh/types": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/transforms/rate-limit/package.json b/packages/legacy/transforms/rate-limit/package.json index 16a5de4c018d4..b6aa9e702abb6 100644 --- a/packages/legacy/transforms/rate-limit/package.json +++ b/packages/legacy/transforms/rate-limit/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/transforms/rate-limit/tests/rate-limit.spec.ts b/packages/legacy/transforms/rate-limit/tests/rate-limit.spec.ts index f264d6198e547..1d94e074f619b 100644 --- a/packages/legacy/transforms/rate-limit/tests/rate-limit.spec.ts +++ b/packages/legacy/transforms/rate-limit/tests/rate-limit.spec.ts @@ -1,8 +1,10 @@ import { setTimeout } from 'timers/promises'; -import { execute, parse } from 'graphql'; +import { parse } from 'graphql'; import InMemoryLRUCache from '@graphql-mesh/cache-localforage'; import { defaultImportFn, DefaultLogger, PubSub } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { makeExecutableSchema } from '@graphql-tools/schema'; +import { isAsyncIterable } from '@graphql-tools/utils'; import { wrapSchema } from '@graphql-tools/wrap'; import RateLimitTransform from '../src/index.js'; @@ -67,7 +69,7 @@ describe('Rate Limit Transform', () => { } `; const executeQuery = () => - execute({ + normalizedExecutor({ schema: wrappedSchema, document: parse(query), contextValue: { @@ -84,6 +86,9 @@ describe('Rate Limit Transform', () => { }); } const result = await executeQuery(); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } // Resolver shouldn't be called expect(numberOfCalls).toBe(5); @@ -132,7 +137,7 @@ describe('Rate Limit Transform', () => { } `; const executeQuery = () => - execute({ + normalizedExecutor({ schema: wrappedSchema, document: parse(query), contextValue: { @@ -151,6 +156,9 @@ describe('Rate Limit Transform', () => { await setTimeout(1000); const result = await executeQuery(); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(result.errors?.length).toBeFalsy(); expect(result.data?.foo).toBe('bar'); }); @@ -196,7 +204,7 @@ describe('Rate Limit Transform', () => { for (let i = 0; i < 2; i++) { const executeQuery = () => - execute({ + normalizedExecutor({ schema: wrappedSchema, document: parse(query), contextValue: { @@ -211,13 +219,16 @@ describe('Rate Limit Transform', () => { }, }); - const resultFails = await execute({ + const resultFails = await normalizedExecutor({ schema: wrappedSchema, document: parse(query), contextValue: { userId: `User${i}`, }, }); + if (isAsyncIterable(resultFails)) { + throw new Error('Result should not be an async iterable'); + } expect(resultFails.data?.foo).toBeNull(); const firstError = resultFails.errors?.[0]; @@ -267,7 +278,7 @@ describe('Rate Limit Transform', () => { }); const executeQuery = () => - execute({ + normalizedExecutor({ schema: wrappedSchema, document: parse(/* GraphQL */ ` query TestQuery { @@ -282,6 +293,9 @@ describe('Rate Limit Transform', () => { await executeQuery(); const result = await executeQuery(); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(result.data.bar).toBe('BAR'); expect(result.errors?.[0]?.message).toBe(`Rate limit of "Query.foo" exceeded for "MYUSER"`); }); diff --git a/packages/legacy/transforms/rename/package.json b/packages/legacy/transforms/rename/package.json index 7cd7670151c6b..f037d5c9765b2 100644 --- a/packages/legacy/transforms/rename/package.json +++ b/packages/legacy/transforms/rename/package.json @@ -34,12 +34,12 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/wrap": "^10.0.5", "graphql-scalars": "^1.22.4" }, diff --git a/packages/legacy/transforms/replace-field/package.json b/packages/legacy/transforms/replace-field/package.json index 742269ca48882..9d7b23ced359c 100644 --- a/packages/legacy/transforms/replace-field/package.json +++ b/packages/legacy/transforms/replace-field/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/legacy/transforms/replace-field/test/replace-field.spec.ts b/packages/legacy/transforms/replace-field/test/replace-field.spec.ts index b63a62ebb3ffc..6f38ebeccc023 100644 --- a/packages/legacy/transforms/replace-field/test/replace-field.spec.ts +++ b/packages/legacy/transforms/replace-field/test/replace-field.spec.ts @@ -1,10 +1,11 @@ import { join } from 'path'; -import { execute, GraphQLObjectType, parse, printSchema } from 'graphql'; +import { GraphQLObjectType, parse, printSchema } from 'graphql'; import InMemoryLRUCache from '@graphql-mesh/cache-localforage'; import type { ImportFn, MeshPubSub } from '@graphql-mesh/types'; import { DefaultLogger, PubSub } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { pruneSchema } from '@graphql-tools/utils'; +import { isAsyncIterable, pruneSchema } from '@graphql-tools/utils'; import ReplaceFieldTransform from '../src/index.js'; const importFn: ImportFn = m => @@ -156,7 +157,7 @@ describe('replace-field', () => { ).toBe('String'); expect(printSchema(transformedSchema)).toMatchSnapshot(); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -169,6 +170,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(mockQueryBooks).toHaveBeenCalledTimes(1); expect(mockBooksApiResponseBooks).not.toHaveBeenCalled(); expect(result.data.books).toEqual([ @@ -219,7 +223,7 @@ describe('replace-field', () => { (transformedSchema.getType('Query') as GraphQLObjectType).getFields().books.type.toString(), ).toBe('[Book]'); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -231,6 +235,9 @@ describe('replace-field', () => { }); expect(mockQueryBooks).toHaveBeenCalledTimes(1); expect(mockBooksApiResponseBooks).not.toHaveBeenCalled(); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(result.data.books).toEqual([{ title: 'abc' }, { title: 'def' }]); }); @@ -280,7 +287,7 @@ describe('replace-field', () => { (transformedSchema.getType('Book') as GraphQLObjectType).getFields().author.type.toString(), ).toBe('String!'); - const result: any = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -293,6 +300,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(result.data.books.books).toEqual([ { title: 'abc', author: 'abra' }, { title: 'def', author: 'cadabra' }, @@ -364,7 +374,7 @@ describe('replace-field', () => { ).toBe('String!'); expect(printSchema(transformedSchema)).toMatchSnapshot(); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -375,6 +385,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(mockQueryBooks).toHaveBeenCalledTimes(1); expect(mockBooksApiResponseBooks).not.toHaveBeenCalled(); expect(result.data.books).toEqual([ @@ -424,7 +437,7 @@ describe('replace-field', () => { }); const transformedSchema = pruneSchema(transform.transformSchema(schema)); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -435,6 +448,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(mockQueryBooks).toHaveBeenCalledTimes(1); expect(mockBooksApiResponseBooks).not.toHaveBeenCalled(); expect(result.data.books).toEqual([{ title: 'abc' }, { title: 'def' }]); @@ -490,7 +506,7 @@ describe('replace-field', () => { (transformedSchema.getType('Book') as GraphQLObjectType).getFields().code.type.toString(), ).toBe('String!'); - const result: any = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -503,6 +519,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(result.data.books.books).toEqual([ { title: 'abc', code: 'store001_def' }, { title: 'ghi', code: 'store001_lmn' }, @@ -564,7 +583,7 @@ describe('replace-field', () => { .fullName.type.toString(), ).toBe('String'); - const result: any = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -579,6 +598,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(result.data.books.books).toEqual([ { title: 'abc', author: { fullName: 'abra' } }, { title: 'def', author: { fullName: 'cadabra' } }, @@ -633,7 +655,7 @@ describe('replace-field', () => { .ourBooks.type.toString(), ).toBe('[Book]'); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -643,6 +665,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(mockQueryBooks).toHaveBeenCalledTimes(1); expect(mockBooksApiResponseBooks).not.toHaveBeenCalled(); expect(result.data.ourBooks).toEqual([{ title: 'abc' }, { title: 'def' }]); @@ -700,7 +725,7 @@ describe('replace-field', () => { .authorName.type.toString(), ).toBe('String!'); - const result: any = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -713,6 +738,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(result.data.books.books).toEqual([ { title: 'abc', authorName: 'abra' }, { title: 'def', authorName: 'cadabra' }, @@ -770,7 +798,7 @@ describe('replace-field', () => { .ourBooks.type.toString(), ).toBe('[Book]'); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -781,6 +809,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(mockQueryBooks).toHaveBeenCalledTimes(1); expect(mockBooksApiResponseBooks).not.toHaveBeenCalled(); expect(result.data.ourBooks).toEqual([{ title: 'abc' }, { title: 'def' }]); @@ -842,7 +873,7 @@ describe('replace-field', () => { .isAvailable.type.toString(), ).toBe('Boolean'); - const result: any = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -855,6 +886,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(result.data.books.books).toEqual([ { title: 'abc', isAvailable: false }, { title: 'def', isAvailable: true }, @@ -915,7 +949,7 @@ describe('replace-field', () => { await queryBooks.resolve(); expect(mockBooksApiResponseBooks).toHaveBeenCalledTimes(1); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -925,6 +959,9 @@ describe('replace-field', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Result should not be an async iterable'); + } expect(mockQueryBooks).not.toHaveBeenCalled(); expect(mockBooksApiResponseBooks).toHaveBeenCalledTimes(2); expect(result.data.books).toEqual([{ title: 'ghi' }, { title: 'lmn' }]); diff --git a/packages/legacy/transforms/resolvers-composition/test/transform.spec.ts b/packages/legacy/transforms/resolvers-composition/test/transform.spec.ts index 3c75255df1dce..9350cfe309bc7 100644 --- a/packages/legacy/transforms/resolvers-composition/test/transform.spec.ts +++ b/packages/legacy/transforms/resolvers-composition/test/transform.spec.ts @@ -1,8 +1,10 @@ import { join } from 'path'; -import { execute, parse } from 'graphql'; +import { parse } from 'graphql'; import InMemoryLRUCache from '@graphql-mesh/cache-localforage'; import { DefaultLogger, PubSub } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { makeExecutableSchema } from '@graphql-tools/schema'; +import { isAsyncIterable } from '@graphql-tools/utils'; import ResolversCompositionTransform, { type ResolversComposition } from '../src/index.js'; describe('transform', () => { @@ -36,7 +38,7 @@ describe('transform', () => { }, }); const transformedSchema = transform.transformSchema(schema); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -44,6 +46,9 @@ describe('transform', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Unexpected AsyncIterable'); + } expect(result.data?.foo).toBe('FOO'); }); it('should handle composition functions from functions', async () => { @@ -75,7 +80,7 @@ describe('transform', () => { }, }); const transformedSchema = transform.transformSchema(schema); - const result = await execute({ + const result = await normalizedExecutor({ schema: transformedSchema, document: parse(/* GraphQL */ ` { @@ -83,6 +88,9 @@ describe('transform', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Unexpected AsyncIterable'); + } expect(result.data?.foo).toBe('FOO'); }); }); diff --git a/packages/legacy/transforms/transfer-schema/package.json b/packages/legacy/transforms/transfer-schema/package.json index 38d8745b33a92..87710554902eb 100644 --- a/packages/legacy/transforms/transfer-schema/package.json +++ b/packages/legacy/transforms/transfer-schema/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*" }, "dependencies": { diff --git a/packages/legacy/transforms/type-merging/package.json b/packages/legacy/transforms/type-merging/package.json index c837598ce81da..3a2b9f0482f5e 100644 --- a/packages/legacy/transforms/type-merging/package.json +++ b/packages/legacy/transforms/type-merging/package.json @@ -38,7 +38,7 @@ "tslib": "^2.4.0" }, "dependencies": { - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/stitching-directives": "^3.1.2" }, "publishConfig": { diff --git a/packages/legacy/types/package.json b/packages/legacy/types/package.json index 1716073c87c77..da5ca05f5861c 100644 --- a/packages/legacy/types/package.json +++ b/packages/legacy/types/package.json @@ -33,13 +33,13 @@ "typings": "dist/typings/index.d.ts", "peerDependencies": { "@graphql-mesh/store": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { "@graphql-tools/batch-delegate": "^9.0.3", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-typed-document-node/core": "^3.2.0" }, "publishConfig": { diff --git a/packages/legacy/urql/package.json b/packages/legacy/urql/package.json index a1dadbdbba3f0..7adefec996705 100644 --- a/packages/legacy/urql/package.json +++ b/packages/legacy/urql/package.json @@ -33,7 +33,7 @@ "typings": "dist/typings/index.d.ts", "peerDependencies": { "@graphql-mesh/runtime": "^0.100.8", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "@urql/core": "^2.4.3 || ^4.0.0 || ^5.0.0", "graphql": "^15.2.0 || ^16.0.0", "tslib": "^2.4.0", diff --git a/packages/legacy/utils/package.json b/packages/legacy/utils/package.json index ecb5c4613346f..f05b388be8361 100644 --- a/packages/legacy/utils/package.json +++ b/packages/legacy/utils/package.json @@ -34,13 +34,13 @@ "peerDependencies": { "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { "@graphql-mesh/string-interpolation": "^0.5.5", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@whatwg-node/disposablestack": "^0.0.1", "@whatwg-node/fetch": "^0.9.13", "dset": "^3.1.2", diff --git a/packages/loaders/json-schema/package.json b/packages/loaders/json-schema/package.json index dec039aba893b..71dc3d0982155 100644 --- a/packages/loaders/json-schema/package.json +++ b/packages/loaders/json-schema/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, @@ -43,7 +43,7 @@ "@graphql-mesh/string-interpolation": "0.5.5", "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/transport-rest": "^0.4.9", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@json-schema-tools/meta-schema": "1.7.5", "@whatwg-node/fetch": "^0.9.0", "ajv": "8.17.1", diff --git a/packages/loaders/json-schema/test/execution.test.ts b/packages/loaders/json-schema/test/execution.test.ts index 858c6f9364d2d..fc640c5e92439 100644 --- a/packages/loaders/json-schema/test/execution.test.ts +++ b/packages/loaders/json-schema/test/execution.test.ts @@ -1,5 +1,6 @@ -import { execute, OperationTypeNode, parse } from 'graphql'; +import { OperationTypeNode, parse } from 'graphql'; import { getHeadersObj } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { Request, Response } from '@whatwg-node/fetch'; import loadGraphQLSchemaFromJSONSchemas from '../src/index.js'; @@ -50,7 +51,7 @@ describe('Execution', () => { } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), contextValue: { @@ -66,7 +67,7 @@ describe('Execution', () => { }, }); - const result2 = await execute({ + const result2 = await normalizedExecutor({ schema, document: parse(query), contextValue: {}, @@ -132,7 +133,7 @@ describe('Execution', () => { } } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), }); @@ -198,7 +199,7 @@ describe('Execution', () => { } } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), }); @@ -266,7 +267,7 @@ describe('Execution', () => { } } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), }); @@ -334,7 +335,7 @@ describe('Execution', () => { } } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), }); @@ -402,7 +403,7 @@ describe('Execution', () => { } } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), }); @@ -458,7 +459,7 @@ describe('Execution', () => { } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), }); @@ -511,7 +512,7 @@ describe('Execution', () => { } `; - await execute({ + await normalizedExecutor({ schema, document: parse(query), }); @@ -538,7 +539,7 @@ describe('Execution', () => { getTest } `; - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(query), }); diff --git a/packages/loaders/json-schema/test/query-params.test.ts b/packages/loaders/json-schema/test/query-params.test.ts index 258fbce5cff25..e7ea7361e42a4 100644 --- a/packages/loaders/json-schema/test/query-params.test.ts +++ b/packages/loaders/json-schema/test/query-params.test.ts @@ -1,4 +1,5 @@ -import { execute, OperationTypeNode, parse } from 'graphql'; +import { OperationTypeNode, parse } from 'graphql'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { printSchemaWithDirectives } from '@graphql-tools/utils'; import { Response } from '@whatwg-node/fetch'; import { loadGraphQLSchemaFromJSONSchemas } from '../src/loadGraphQLSchemaFromJSONSchemas.js'; @@ -23,7 +24,7 @@ describe('Query Params', () => { }, }); expect(printSchemaWithDirectives(schema)).toMatchSnapshot('queryParamsSample'); - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(/* GraphQL */ ` query { @@ -31,7 +32,6 @@ describe('Query Params', () => { } `), }); - expect(result.errors).toBeUndefined(); expect(result).toEqual({ data: { test: 'foo:bar=baz', diff --git a/packages/loaders/json-schema/test/timeout.test.ts b/packages/loaders/json-schema/test/timeout.test.ts index 23f102a6927af..cb5e37a71a8b9 100644 --- a/packages/loaders/json-schema/test/timeout.test.ts +++ b/packages/loaders/json-schema/test/timeout.test.ts @@ -1,5 +1,7 @@ /* eslint-disable import/no-nodejs-modules */ -import { execute, OperationTypeNode, parse } from 'graphql'; +import { OperationTypeNode, parse } from 'graphql'; +import { normalizedExecutor } from '@graphql-tools/executor'; +import { isAsyncIterable } from '@graphql-tools/utils'; import { createDisposableServer } from '../../../testing/createDisposableServer.js'; import { loadGraphQLSchemaFromJSONSchemas } from '../src/loadGraphQLSchemaFromJSONSchemas.js'; @@ -32,7 +34,7 @@ describe('Timeout', () => { }, ], }); - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(/* GraphQL */ ` query { @@ -40,6 +42,9 @@ describe('Timeout', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Should not be async iterable'); + } expect(result?.errors?.[0]).toBeDefined(); }); }); diff --git a/packages/loaders/mysql/package.json b/packages/loaders/mysql/package.json index 369c1f2a2db2f..0035f6a43aad2 100644 --- a/packages/loaders/mysql/package.json +++ b/packages/loaders/mysql/package.json @@ -40,8 +40,8 @@ "@graphql-mesh/string-interpolation": "^0.5.5", "@graphql-mesh/transport-mysql": "^0.4.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/delegate": "^10.0.17", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/delegate": "^10.0.18", + "@graphql-tools/utils": "^10.3.4", "graphql-compose": "^9.0.11", "graphql-fields": "^2.0.3", "graphql-scalars": "^1.22.4", diff --git a/packages/loaders/neo4j/package.json b/packages/loaders/neo4j/package.json index 9c3cf22752f40..0b56673d37386 100644 --- a/packages/loaders/neo4j/package.json +++ b/packages/loaders/neo4j/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@graphql-mesh/transport-neo4j": "^0.4.7", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/schema": "^10.0.4", "@neo4j/introspector": "^3.0.0", "neo4j-driver": "^5.9.2" diff --git a/packages/loaders/openapi/package.json b/packages/loaders/openapi/package.json index 3e24346cdc0ba..d52a5aa8ded81 100644 --- a/packages/loaders/openapi/package.json +++ b/packages/loaders/openapi/package.json @@ -40,14 +40,14 @@ }, "dependencies": { "@graphql-mesh/string-interpolation": "^0.5.5", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@omnigraph/json-schema": "^0.103.2", "change-case": "^4.1.2", "json-machete": "^0.97.3", "openapi-types": "^12.1.0" }, "devDependencies": { - "@graphql-tools/utils": "10.3.3", + "@graphql-tools/utils": "10.3.4", "@whatwg-node/fetch": "0.9.19", "fets": "0.8.1", "graphql-yoga": "5.6.3", diff --git a/packages/loaders/openapi/tests/additionalProperties.test.ts b/packages/loaders/openapi/tests/additionalProperties.test.ts index b42a76d2bf025..c8ac550cb6207 100644 --- a/packages/loaders/openapi/tests/additionalProperties.test.ts +++ b/packages/loaders/openapi/tests/additionalProperties.test.ts @@ -1,6 +1,7 @@ import { createRouter, Response } from 'fets'; -import { execute, GraphQLSchema, parse } from 'graphql'; -import { printSchemaWithDirectives } from '@graphql-tools/utils'; +import { GraphQLSchema, parse } from 'graphql'; +import { normalizedExecutor } from '@graphql-tools/executor'; +import { isAsyncIterable, printSchemaWithDirectives } from '@graphql-tools/utils'; import { loadGraphQLSchemaFromOpenAPI } from '../src/loadGraphQLSchemaFromOpenAPI.js'; describe('additionalProperties', () => { @@ -39,7 +40,7 @@ describe('additionalProperties', () => { expect(printSchemaWithDirectives(schema)).toMatchSnapshot('schema'); }); it('should return values correctly', async () => { - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(/* GraphQL */ ` query { diff --git a/packages/loaders/openapi/tests/authentication.test.ts b/packages/loaders/openapi/tests/authentication.test.ts index b82e116b19442..3a3012d98c067 100644 --- a/packages/loaders/openapi/tests/authentication.test.ts +++ b/packages/loaders/openapi/tests/authentication.test.ts @@ -1,5 +1,6 @@ /* eslint-disable import/no-nodejs-modules */ -import { execute, parse } from 'graphql'; +import { parse } from 'graphql'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { loadGraphQLSchemaFromOpenAPI } from '../src/loadGraphQLSchemaFromOpenAPI.js'; import { exampleApi } from './example_api_server.js'; @@ -32,7 +33,7 @@ describe('OpenAPI Loader: Authentication', () => { fetch: exampleApi.fetch as any, }); - const result = await execute({ + const result = await normalizedExecutor({ schema: createdSchema, document: parse(query), }); @@ -65,7 +66,7 @@ describe('OpenAPI Loader: Authentication', () => { fetch: exampleApi.fetch as any, }); - const result = await execute({ + const result = await normalizedExecutor({ schema: createdSchema, document: parse(query), }); @@ -98,7 +99,7 @@ describe('OpenAPI Loader: Authentication', () => { fetch: exampleApi.fetch as any, }); - const result = await execute({ + const result = await normalizedExecutor({ schema: createdSchema, document: parse(query), }); @@ -131,7 +132,7 @@ describe('OpenAPI Loader: Authentication', () => { fetch: exampleApi.fetch as any, }); - const result = await execute({ + const result = await normalizedExecutor({ schema: createdSchema, document: parse(query), }); diff --git a/packages/loaders/openapi/tests/unknown-properties-union.test.ts b/packages/loaders/openapi/tests/unknown-properties-union.test.ts index 013cf8e8cda78..4c00794916a05 100644 --- a/packages/loaders/openapi/tests/unknown-properties-union.test.ts +++ b/packages/loaders/openapi/tests/unknown-properties-union.test.ts @@ -1,4 +1,5 @@ -import { execute, GraphQLSchema, parse } from 'graphql'; +import { GraphQLSchema, parse } from 'graphql'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { Response } from '@whatwg-node/fetch'; import { loadGraphQLSchemaFromOpenAPI } from '../src/loadGraphQLSchemaFromOpenAPI.js'; @@ -30,7 +31,7 @@ describe('additional properties in union type', () => { } } `; - const result = await execute({ + const result = await normalizedExecutor({ schema: createdSchema, document: parse(query), }); diff --git a/packages/loaders/raml/package.json b/packages/loaders/raml/package.json index fb3d65197e42a..a6cc52f8912d7 100644 --- a/packages/loaders/raml/package.json +++ b/packages/loaders/raml/package.json @@ -35,14 +35,14 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, "dependencies": { "@ardatan/raml-1-parser": "1.1.69", "@graphql-mesh/string-interpolation": "0.5.5", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@omnigraph/json-schema": "0.103.2", "@whatwg-node/fetch": "^0.9.0", "change-case": "4.1.2", diff --git a/packages/loaders/raml/tests/query-params.test.ts b/packages/loaders/raml/tests/query-params.test.ts index d15f062934e9a..7bffd63883bb2 100644 --- a/packages/loaders/raml/tests/query-params.test.ts +++ b/packages/loaders/raml/tests/query-params.test.ts @@ -1,5 +1,6 @@ -import { execute, GraphQLSchema, parse } from 'graphql'; -import { printSchemaWithDirectives } from '@graphql-tools/utils'; +import { GraphQLSchema, parse } from 'graphql'; +import { normalizedExecutor } from '@graphql-tools/executor'; +import { isAsyncIterable, printSchemaWithDirectives } from '@graphql-tools/utils'; import { Response, URL } from '@whatwg-node/fetch'; import { loadGraphQLSchemaFromRAML } from '../src/loadGraphQLSchemaFromRAML.js'; @@ -33,7 +34,7 @@ describe('Query Parameters', () => { expect(printSchemaWithDirectives(schema)).toMatchSnapshot(); }); it('respects default values', async () => { - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(/* GraphQL */ ` query { @@ -44,6 +45,9 @@ describe('Query Parameters', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Expected a result, but got an async iterable'); + } expect(result.errors).toBeFalsy(); expect(result.data).toEqual({ listOfProducts: [ @@ -55,7 +59,7 @@ describe('Query Parameters', () => { }); }); it('respects arguments with values', async () => { - const result = await execute({ + const result = await normalizedExecutor({ schema, document: parse(/* GraphQL */ ` query { @@ -70,6 +74,9 @@ describe('Query Parameters', () => { } `), }); + if (isAsyncIterable(result)) { + throw new Error('Expected a result, but got an async iterable'); + } expect(result.errors).toBeFalsy(); expect(result.data).toEqual({ trueOne: [ diff --git a/packages/loaders/soap/package.json b/packages/loaders/soap/package.json index 1429407bfdc50..1d80d0fb9d56d 100644 --- a/packages/loaders/soap/package.json +++ b/packages/loaders/soap/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*" }, "dependencies": { diff --git a/packages/loaders/sqlite/package.json b/packages/loaders/sqlite/package.json index e0c28cda99604..1cb4447b9d0b6 100644 --- a/packages/loaders/sqlite/package.json +++ b/packages/loaders/sqlite/package.json @@ -38,7 +38,7 @@ "dependencies": { "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", - "@graphql-tools/delegate": "^10.0.17" + "@graphql-tools/delegate": "^10.0.18" }, "optionalDependencies": { "tuql": "^1.7.0" diff --git a/packages/loaders/thrift/package.json b/packages/loaders/thrift/package.json index 3467bf114d232..60219b496ebbb 100644 --- a/packages/loaders/thrift/package.json +++ b/packages/loaders/thrift/package.json @@ -46,7 +46,7 @@ "thrift": "^0.20.0" }, "devDependencies": { - "@graphql-tools/utils": "10.3.3" + "@graphql-tools/utils": "10.3.4" }, "publishConfig": { "access": "public", diff --git a/packages/plugins/mock/package.json b/packages/plugins/mock/package.json index afa9d0ad7591c..b651de1c85ccd 100644 --- a/packages/plugins/mock/package.json +++ b/packages/plugins/mock/package.json @@ -35,7 +35,7 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/plugins/mock/tests/mocking.spec.ts b/packages/plugins/mock/tests/mocking.spec.ts index 2169ee59400d9..e6472b054a491 100644 --- a/packages/plugins/mock/tests/mocking.spec.ts +++ b/packages/plugins/mock/tests/mocking.spec.ts @@ -1,8 +1,9 @@ -import { buildSchema, execute, parse, specifiedRules, subscribe, validate } from 'graphql'; +import { buildSchema, parse, specifiedRules, validate } from 'graphql'; import { envelop, useEngine, useSchema } from '@envelop/core'; import InMemoryLRUCache from '@graphql-mesh/cache-localforage'; import type { ImportFn, Logger, MeshPubSub, YamlConfig } from '@graphql-mesh/types'; import { DefaultLogger, PubSub } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { makeExecutableSchema } from '@graphql-tools/schema'; import useMock from '../src/index.js'; @@ -15,8 +16,8 @@ describe('mocking', () => { const enginePlugin = useEngine({ parse, validate, - execute, - subscribe, + execute: normalizedExecutor, + subscribe: normalizedExecutor, specifiedRules, }); diff --git a/packages/plugins/opentelemetry/package.json b/packages/plugins/opentelemetry/package.json index e0c9104845060..045bc7b130106 100644 --- a/packages/plugins/opentelemetry/package.json +++ b/packages/plugins/opentelemetry/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@graphql-mesh/transport-common": "^0.4.5", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "@opentelemetry/api": "^1.9.0", "@opentelemetry/auto-instrumentations-node": "^0.49.0", "@opentelemetry/context-async-hooks": "^1.25.1", diff --git a/packages/plugins/rate-limit/package.json b/packages/plugins/rate-limit/package.json index 83bd0d4c8e6cb..be7a43b9354ac 100644 --- a/packages/plugins/rate-limit/package.json +++ b/packages/plugins/rate-limit/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/types": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql": "*", "tslib": "^2.4.0" }, diff --git a/packages/plugins/rate-limit/tests/rate-limit.spec.ts b/packages/plugins/rate-limit/tests/rate-limit.spec.ts index 42b066aad3939..2fc690dcc4d9c 100644 --- a/packages/plugins/rate-limit/tests/rate-limit.spec.ts +++ b/packages/plugins/rate-limit/tests/rate-limit.spec.ts @@ -1,8 +1,9 @@ /* eslint-disable import/no-extraneous-dependencies */ import { setTimeout } from 'timers/promises'; -import { execute, parse, specifiedRules, subscribe, validate } from 'graphql'; +import { parse, specifiedRules, validate } from 'graphql'; import { envelop, useEngine, useSchema } from '@envelop/core'; import InMemoryLRUCache from '@graphql-mesh/cache-localforage'; +import { normalizedExecutor } from '@graphql-tools/executor'; import { makeExecutableSchema } from '@graphql-tools/schema'; import useMeshRateLimit from '../src/index.js'; @@ -12,8 +13,8 @@ describe('Rate Limit Plugin', () => { const graphQLEnginePlugin = useEngine({ parse, validate, - execute, - subscribe, + execute: normalizedExecutor, + subscribe: normalizedExecutor, specifiedRules, }); diff --git a/packages/serve-cli/package.json b/packages/serve-cli/package.json index 8897299f79bc6..07da3e46a8454 100644 --- a/packages/serve-cli/package.json +++ b/packages/serve-cli/package.json @@ -54,7 +54,7 @@ "@graphql-mesh/serve-runtime": "^0.5.11", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "commander": "^12.0.0", "dotenv": "^16.3.1", "json-bigint-patch": "^0.0.8", diff --git a/packages/serve-runtime/package.json b/packages/serve-runtime/package.json index b21deaae8075b..e4355fc4d2f32 100644 --- a/packages/serve-runtime/package.json +++ b/packages/serve-runtime/package.json @@ -47,12 +47,11 @@ "@graphql-mesh/transport-http": "^0.3.7", "@graphql-mesh/utils": "^0.99.7", "@graphql-tools/batch-delegate": "^9.0.3", - "@graphql-tools/delegate": "^10.0.17", + "@graphql-tools/delegate": "^10.0.18", "@graphql-tools/executor-http": "^1.1.5", - "@graphql-tools/executor-yoga": "^3.0.0", "@graphql-tools/federation": "^2.2.4", "@graphql-tools/stitch": "^9.2.10", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "@graphql-tools/wrap": "^10.0.5", "@whatwg-node/disposablestack": "^0.0.1", "@whatwg-node/server": "^0.9.46", diff --git a/packages/transports/common/package.json b/packages/transports/common/package.json index 52335ef6f314c..9625408cd6b4b 100644 --- a/packages/transports/common/package.json +++ b/packages/transports/common/package.json @@ -38,8 +38,8 @@ }, "dependencies": { "@envelop/core": "^5.0.1", - "@graphql-tools/delegate": "^10.0.17", - "@graphql-tools/utils": "^10.2.3" + "@graphql-tools/delegate": "^10.0.18", + "@graphql-tools/utils": "^10.3.4" }, "publishConfig": { "access": "public", diff --git a/packages/transports/http-callback/package.json b/packages/transports/http-callback/package.json index 0ac6eb378cba6..fa3e7cfbc5b76 100644 --- a/packages/transports/http-callback/package.json +++ b/packages/transports/http-callback/package.json @@ -40,7 +40,7 @@ "@graphql-mesh/string-interpolation": "^0.5.5", "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "@repeaterjs/repeater": "^3.0.6", "@whatwg-node/fetch": "^0.9.18" }, diff --git a/packages/transports/http/package.json b/packages/transports/http/package.json index 950ed94bf31d8..9f4113103ecde 100644 --- a/packages/transports/http/package.json +++ b/packages/transports/http/package.json @@ -40,7 +40,7 @@ "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/utils": "^0.99.7", "@graphql-tools/executor-http": "^1.1.5", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql-ws": "^5.16.0", "ws": "^8.18.0" }, diff --git a/packages/transports/mysql/package.json b/packages/transports/mysql/package.json index 73f499f9e4d29..e94f9df0019ca 100644 --- a/packages/transports/mysql/package.json +++ b/packages/transports/mysql/package.json @@ -41,8 +41,8 @@ "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/delegate": "^10.0.17", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/delegate": "^10.0.18", + "@graphql-tools/utils": "^10.3.4", "graphql-fields": "^2.0.3", "mysql": "^2.18.1", "mysql-utilities": "^1.1.4" diff --git a/packages/transports/neo4j/package.json b/packages/transports/neo4j/package.json index 892ecdfa757c1..b09568e01d4d8 100644 --- a/packages/transports/neo4j/package.json +++ b/packages/transports/neo4j/package.json @@ -39,8 +39,8 @@ "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/delegate": "^10.0.17", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/delegate": "^10.0.18", + "@graphql-tools/utils": "^10.3.4", "@neo4j/graphql": "^5.0.0", "graphql-scalars": "^1.22.4", "neo4j-driver": "^5.17.0" diff --git a/packages/transports/rest/package.json b/packages/transports/rest/package.json index 316907ea3c21c..94b679e4ccc22 100644 --- a/packages/transports/rest/package.json +++ b/packages/transports/rest/package.json @@ -36,7 +36,7 @@ "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/types": "^0.99.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "@whatwg-node/fetch": "^0.9.15", "graphql": "*", "tslib": "^2.4.0" diff --git a/packages/transports/soap/package.json b/packages/transports/soap/package.json index c208601eeb1c7..ee9ab7fbf167e 100644 --- a/packages/transports/soap/package.json +++ b/packages/transports/soap/package.json @@ -35,7 +35,8 @@ "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/types": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/executor": "^1.3.1", + "@graphql-tools/utils": "^10.3.4", "@whatwg-node/fetch": "^0.9.15", "graphql": "*", "tslib": "^2.4.0" diff --git a/packages/transports/soap/src/executor.ts b/packages/transports/soap/src/executor.ts index 53e4b0e300317..2db60755fc438 100644 --- a/packages/transports/soap/src/executor.ts +++ b/packages/transports/soap/src/executor.ts @@ -5,12 +5,13 @@ import type { GraphQLResolveInfo, GraphQLSchema, } from 'graphql'; -import { execute, isListType, isNonNullType } from 'graphql'; +import { isListType, isNonNullType } from 'graphql'; import { process } from '@graphql-mesh/cross-helpers'; import type { ResolverDataBasedFactory } from '@graphql-mesh/string-interpolation'; import { getInterpolatedHeadersFactory } from '@graphql-mesh/string-interpolation'; import type { MeshFetch } from '@graphql-mesh/types'; import { getDirectiveExtensions } from '@graphql-mesh/utils'; +import { normalizedExecutor } from '@graphql-tools/executor'; import type { Executor } from '@graphql-tools/utils'; import { getRootTypes } from '@graphql-tools/utils'; import { fetch as defaultFetchFn } from '@whatwg-node/fetch'; @@ -182,13 +183,13 @@ export function createExecutorFromSchemaAST( schema: GraphQLSchema, fetchFn: MeshFetch = defaultFetchFn, operationHeaders: Record = {}, -) { +): Executor { let rootValue: Record; return function soapExecutor({ document, variables, context }) { if (!rootValue) { rootValue = createRootValue(schema, fetchFn, operationHeaders); } - return execute({ + return normalizedExecutor({ schema, document, rootValue, @@ -196,5 +197,5 @@ export function createExecutorFromSchemaAST( variableValues: variables, fieldResolver: defaultFieldResolver, }); - } as Executor; + }; } diff --git a/packages/transports/thrift/package.json b/packages/transports/thrift/package.json index cf36b2220cc99..f672ebcc04486 100644 --- a/packages/transports/thrift/package.json +++ b/packages/transports/thrift/package.json @@ -41,7 +41,7 @@ "@graphql-mesh/string-interpolation": "^0.5.5", "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/utils": "^0.99.7", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "pascal-case": "^3.1.2" }, "publishConfig": { diff --git a/packages/transports/ws/package.json b/packages/transports/ws/package.json index 8af2075c381aa..2aeace820a6dc 100644 --- a/packages/transports/ws/package.json +++ b/packages/transports/ws/package.json @@ -41,7 +41,7 @@ "@graphql-mesh/transport-common": "^0.4.7", "@graphql-mesh/utils": "^0.99.7", "@graphql-tools/executor-graphql-ws": "^1.2.0", - "@graphql-tools/utils": "^10.2.3", + "@graphql-tools/utils": "^10.3.4", "graphql-ws": "^5.16.0", "ws": "^8.18.0" }, diff --git a/yarn.lock b/yarn.lock index 1c5bacd38b455..311111abf61ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -63,7 +63,7 @@ __metadata: languageName: node linkType: hard -"@apollo/client@npm:3.11.3": +"@apollo/client@npm:3.11.3, @apollo/client@npm:^3.8.0, @apollo/client@npm:~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0 || ~3.8.0 || ~3.9.0 || ~3.10.0 || ~3.11.0": version: 3.11.3 resolution: "@apollo/client@npm:3.11.3" dependencies: @@ -100,43 +100,6 @@ __metadata: languageName: node linkType: hard -"@apollo/client@npm:^3.8.0, @apollo/client@npm:~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0 || ~3.8.0 || ~3.9.0 || ~3.10.0 || ~3.11.0": - version: 3.11.2 - resolution: "@apollo/client@npm:3.11.2" - dependencies: - "@graphql-typed-document-node/core": "npm:^3.1.1" - "@wry/caches": "npm:^1.0.0" - "@wry/equality": "npm:^0.5.6" - "@wry/trie": "npm:^0.5.0" - graphql-tag: "npm:^2.12.6" - hoist-non-react-statics: "npm:^3.3.2" - optimism: "npm:^0.18.0" - prop-types: "npm:^15.7.2" - rehackt: "npm:^0.1.0" - response-iterator: "npm:^0.2.6" - symbol-observable: "npm:^4.0.0" - ts-invariant: "npm:^0.10.3" - tslib: "npm:^2.3.0" - zen-observable-ts: "npm:^1.2.5" - peerDependencies: - graphql: ^15.0.0 || ^16.0.0 - graphql-ws: ^5.5.5 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 - subscriptions-transport-ws: ^0.9.0 || ^0.11.0 - peerDependenciesMeta: - graphql-ws: - optional: true - react: - optional: true - react-dom: - optional: true - subscriptions-transport-ws: - optional: true - checksum: 10c0/b63e5c1a509ac721bfb3bfbf41d11ffc3f1460d98d297e65cad6ace2d5102d7591e6fb88297f286d7a9cfdcc7f4341cf787474a61c70a98e588ea5f6c8469435 - languageName: node - linkType: hard - "@apollo/composition@npm:2.8.4": version: 2.8.4 resolution: "@apollo/composition@npm:2.8.4" @@ -5773,7 +5736,7 @@ __metadata: peerDependencies: "@apollo/client": ^3.5.9 "@graphql-mesh/runtime": ^0.100.8 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: ^15.2.0 || ^16.0.0 tslib: ^2.4.0 languageName: unknown @@ -5855,7 +5818,7 @@ __metadata: "@graphql-mesh/store": "npm:^0.99.7" "@graphql-mesh/types": "npm:^0.99.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@types/lodash.get": "npm:4.4.9" "@types/mkdirp": "npm:2.0.0" "@types/rimraf": "npm:4.0.5" @@ -5905,7 +5868,7 @@ __metadata: "@graphql-tools/graphql-file-loader": "npm:8.0.1" "@graphql-tools/load": "npm:^8.0.1" "@graphql-tools/schema": "npm:^10.0.4" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@whatwg-node/fetch": "npm:^0.9.14" commander: "npm:^12.0.0" dotenv: "npm:^16.3.1" @@ -5939,7 +5902,7 @@ __metadata: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -5951,7 +5914,7 @@ __metadata: dependencies: path-browserify: "npm:1.0.1" peerDependencies: - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" languageName: unknown linkType: soft @@ -5963,7 +5926,7 @@ __metadata: "@graphql-mesh/utils": "npm:^0.99.7" "@graphql-tools/schema": "npm:^10.0.4" "@graphql-tools/stitching-directives": "npm:^3.1.2" - "@graphql-tools/utils": "npm:^10.3.2" + "@graphql-tools/utils": "npm:^10.3.4" "@theguild/federation-composition": "npm:^0.12.0" "@types/minimatch": "npm:5.1.2" "@types/pluralize": "npm:^0.0.33" @@ -5988,12 +5951,12 @@ __metadata: "@graphql-mesh/transport-common": "npm:^0.4.7" "@graphql-mesh/types": "npm:^0.99.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" - "@graphql-tools/executor": "npm:^1.3.0" + "@graphql-tools/delegate": "npm:^10.0.18" + "@graphql-tools/executor": "npm:^1.3.1" "@graphql-tools/federation": "npm:^2.2.4" "@graphql-tools/stitch": "npm:^9.2.10" "@graphql-tools/stitching-directives": "npm:^3.1.2" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@graphql-tools/wrap": "npm:^10.0.5" "@whatwg-node/disposablestack": "npm:^0.0.1" change-case: "npm:^4.1.2" @@ -6009,7 +5972,7 @@ __metadata: resolution: "@graphql-mesh/graphql@workspace:packages/legacy/handlers/graphql" dependencies: "@graphql-mesh/string-interpolation": "npm:^0.5.5" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/federation": "npm:^2.2.4" "@graphql-tools/url-loader": "npm:^8.0.0" lodash.get: "npm:^4.4.2" @@ -6018,7 +5981,7 @@ __metadata: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6046,7 +6009,7 @@ __metadata: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6084,7 +6047,7 @@ __metadata: "@graphql-mesh/runtime": ^0.100.8 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6129,7 +6092,7 @@ __metadata: peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6147,7 +6110,8 @@ __metadata: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/executor": ^1.3.1 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6157,14 +6121,14 @@ __metadata: version: 0.0.0-use.local resolution: "@graphql-mesh/merger-stitching@workspace:packages/legacy/mergers/stitching" dependencies: - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/schema": "npm:^10.0.0" "@graphql-tools/stitch": "npm:^9.2.10" peerDependencies: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6198,7 +6162,7 @@ __metadata: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6223,7 +6187,7 @@ __metadata: resolution: "@graphql-mesh/odata@workspace:packages/legacy/handlers/odata" dependencies: "@graphql-mesh/string-interpolation": "npm:^0.5.5" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@types/http-string-parser": "npm:0.0.33" "@types/url-join": "npm:4.0.3" "@whatwg-node/fetch": "npm:^0.9.0" @@ -6240,7 +6204,7 @@ __metadata: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6368,7 +6332,7 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6402,7 +6366,7 @@ __metadata: dependencies: "@graphql-mesh/serve-runtime": "npm:^0.5.5" "@graphql-mesh/transport-common": "npm:^0.4.5" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@opentelemetry/api": "npm:^1.9.0" "@opentelemetry/auto-instrumentations-node": "npm:^0.49.0" "@opentelemetry/context-async-hooks": "npm:^1.25.1" @@ -6476,7 +6440,7 @@ __metadata: peerDependencies: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6536,7 +6500,7 @@ __metadata: resolution: "@graphql-mesh/postgraphile@workspace:packages/legacy/handlers/postgraphile" dependencies: "@graphql-mesh/string-interpolation": "npm:^0.5.5" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" pg: "npm:^8.6.0" postgraphile: "npm:^4.13.0" postgraphile-core: "npm:^4.13.0" @@ -6573,8 +6537,8 @@ __metadata: "@envelop/graphql-jit": "npm:^8.0.0" "@graphql-mesh/string-interpolation": "npm:^0.5.5" "@graphql-tools/batch-delegate": "npm:^9.0.3" - "@graphql-tools/delegate": "npm:^10.0.17" - "@graphql-tools/executor": "npm:^1.3.0" + "@graphql-tools/delegate": "npm:^10.0.18" + "@graphql-tools/executor": "npm:^1.3.1" "@graphql-tools/schema": "npm:10.0.4" "@graphql-tools/wrap": "npm:^10.0.5" "@whatwg-node/fetch": "npm:^0.9.0" @@ -6583,7 +6547,7 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6599,7 +6563,7 @@ __metadata: "@graphql-mesh/serve-runtime": "npm:^0.5.11" "@graphql-mesh/types": "npm:^0.99.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@parcel/watcher": "npm:^2.3.0" "@rollup/plugin-commonjs": "npm:^26.0.1" "@rollup/plugin-json": "npm:^6.1.0" @@ -6645,12 +6609,11 @@ __metadata: "@graphql-mesh/transport-http": "npm:^0.3.7" "@graphql-mesh/utils": "npm:^0.99.7" "@graphql-tools/batch-delegate": "npm:^9.0.3" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/executor-http": "npm:^1.1.5" - "@graphql-tools/executor-yoga": "npm:^3.0.0" "@graphql-tools/federation": "npm:^2.2.4" "@graphql-tools/stitch": "npm:^9.2.10" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@graphql-tools/wrap": "npm:^10.0.5" "@whatwg-node/disposablestack": "npm:^0.0.1" "@whatwg-node/server": "npm:^0.9.46" @@ -6673,7 +6636,7 @@ __metadata: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6689,7 +6652,7 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6739,7 +6702,7 @@ __metadata: "@graphql-mesh/store": ^0.99.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6758,7 +6721,7 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6768,13 +6731,13 @@ __metadata: version: 0.0.0-use.local resolution: "@graphql-mesh/transform-encapsulate@workspace:packages/legacy/transforms/encapsulate" dependencies: - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/schema": "npm:10.0.4" "@graphql-tools/wrap": "npm:^10.0.5" peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6792,7 +6755,7 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6804,14 +6767,14 @@ __metadata: dependencies: "@apollo/subgraph": "npm:^2.4.1" "@graphql-mesh/string-interpolation": "npm:^0.5.5" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/stitching-directives": "npm:^3.1.2" dset: "npm:^3.1.2" graphql-transform-federation: "npm:^2.2.0" peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6821,14 +6784,14 @@ __metadata: version: 0.0.0-use.local resolution: "@graphql-mesh/transform-filter-schema@workspace:packages/legacy/transforms/filter-schema" dependencies: - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/wrap": "npm:^10.0.5" "@types/minimatch": "npm:5.1.2" minimatch: "npm:^10.0.0" peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6841,11 +6804,11 @@ __metadata: "@graphql-hive/core": "npm:^0.6.0" "@graphql-hive/yoga": "npm:^0.34.0" "@graphql-mesh/string-interpolation": "npm:^0.5.5" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" peerDependencies: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6856,12 +6819,12 @@ __metadata: resolution: "@graphql-mesh/transform-hoist-field@workspace:packages/legacy/transforms/hoist-field" dependencies: "@graphql-mesh/cache-localforage": "npm:0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/wrap": "npm:^10.0.5" peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" languageName: unknown linkType: soft @@ -6871,7 +6834,7 @@ __metadata: resolution: "@graphql-mesh/transform-naming-convention@workspace:packages/legacy/transforms/naming-convention" dependencies: "@graphql-mesh/cache-localforage": "npm:^0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/schema": "npm:10.0.4" "@graphql-tools/wrap": "npm:^10.0.5" change-case: "npm:^4.1.2" @@ -6881,7 +6844,7 @@ __metadata: peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.5.0 languageName: unknown @@ -6892,14 +6855,14 @@ __metadata: resolution: "@graphql-mesh/transform-prefix@workspace:packages/legacy/transforms/prefix" dependencies: "@graphql-mesh/cache-localforage": "npm:0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/schema": "npm:10.0.4" "@graphql-tools/wrap": "npm:^10.0.5" graphql-scalars: "npm:^1.22.4" peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6910,7 +6873,7 @@ __metadata: resolution: "@graphql-mesh/transform-prune@workspace:packages/legacy/transforms/prune" peerDependencies: "@graphql-mesh/types": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6929,7 +6892,7 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6940,14 +6903,14 @@ __metadata: resolution: "@graphql-mesh/transform-rename@workspace:packages/legacy/transforms/rename" dependencies: "@graphql-mesh/cache-localforage": "npm:0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/schema": "npm:10.0.4" "@graphql-tools/wrap": "npm:^10.0.5" graphql-scalars: "npm:^1.22.4" peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6965,7 +6928,7 @@ __metadata: peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -6994,7 +6957,7 @@ __metadata: peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" languageName: unknown linkType: soft @@ -7003,7 +6966,7 @@ __metadata: version: 0.0.0-use.local resolution: "@graphql-mesh/transform-type-merging@workspace:packages/legacy/transforms/type-merging" dependencies: - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/stitching-directives": "npm:^3.1.2" peerDependencies: "@graphql-mesh/types": ^0.99.7 @@ -7018,8 +6981,8 @@ __metadata: resolution: "@graphql-mesh/transport-common@workspace:packages/transports/common" dependencies: "@envelop/core": "npm:^5.0.1" - "@graphql-tools/delegate": "npm:^10.0.17" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/delegate": "npm:^10.0.18" + "@graphql-tools/utils": "npm:^10.3.4" peerDependencies: "@graphql-mesh/types": ^0.99.7 graphql: "*" @@ -7035,7 +6998,7 @@ __metadata: "@graphql-mesh/string-interpolation": "npm:^0.5.5" "@graphql-mesh/transport-common": "npm:^0.4.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@repeaterjs/repeater": "npm:^3.0.6" "@types/ws": "npm:^8" "@whatwg-node/fetch": "npm:^0.9.18" @@ -7053,7 +7016,7 @@ __metadata: "@graphql-mesh/transport-common": "npm:^0.4.7" "@graphql-mesh/utils": "npm:^0.99.7" "@graphql-tools/executor-http": "npm:^1.1.5" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@types/ws": "npm:^8" graphql-ws: "npm:^5.16.0" ws: "npm:^8.18.0" @@ -7072,8 +7035,8 @@ __metadata: "@graphql-mesh/transport-common": "npm:^0.4.7" "@graphql-mesh/types": "npm:^0.99.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/delegate": "npm:^10.0.18" + "@graphql-tools/utils": "npm:^10.3.4" graphql-fields: "npm:^2.0.3" mysql: "npm:^2.18.1" mysql-utilities: "npm:^1.1.4" @@ -7090,8 +7053,8 @@ __metadata: "@graphql-mesh/transport-common": "npm:^0.4.7" "@graphql-mesh/types": "npm:^0.99.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/delegate": "npm:^10.0.18" + "@graphql-tools/utils": "npm:^10.3.4" "@neo4j/graphql": "npm:^5.0.0" graphql-scalars: "npm:^1.22.4" neo4j-driver: "npm:^5.17.0" @@ -7116,7 +7079,7 @@ __metadata: "@graphql-mesh/transport-common": ^0.4.7 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 "@whatwg-node/fetch": ^0.9.15 graphql: "*" tslib: ^2.4.0 @@ -7134,7 +7097,8 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/transport-common": ^0.4.7 "@graphql-mesh/types": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/executor": ^1.3.1 + "@graphql-tools/utils": ^10.3.4 "@whatwg-node/fetch": ^0.9.15 graphql: "*" tslib: ^2.4.0 @@ -7162,7 +7126,7 @@ __metadata: "@graphql-mesh/string-interpolation": "npm:^0.5.5" "@graphql-mesh/transport-common": "npm:^0.4.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" pascal-case: "npm:^3.1.2" peerDependencies: graphql: "*" @@ -7179,7 +7143,7 @@ __metadata: "@graphql-mesh/transport-common": "npm:^0.4.7" "@graphql-mesh/utils": "npm:^0.99.7" "@graphql-tools/executor-graphql-ws": "npm:^1.2.0" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@types/ws": "npm:^8" graphql-ws: "npm:^5.16.0" ws: "npm:^8.18.0" @@ -7206,11 +7170,11 @@ __metadata: resolution: "@graphql-mesh/types@workspace:packages/legacy/types" dependencies: "@graphql-tools/batch-delegate": "npm:^9.0.3" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-typed-document-node/core": "npm:^3.2.0" peerDependencies: "@graphql-mesh/store": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -7224,7 +7188,7 @@ __metadata: wonka: "npm:6.3.4" peerDependencies: "@graphql-mesh/runtime": ^0.100.8 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 "@urql/core": ^2.4.3 || ^4.0.0 || ^5.0.0 graphql: ^15.2.0 || ^16.0.0 tslib: ^2.4.0 @@ -7238,7 +7202,7 @@ __metadata: dependencies: "@apollo/server": "npm:4.10.5" "@graphql-mesh/string-interpolation": "npm:^0.5.5" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@types/js-yaml": "npm:4.0.9" "@types/lodash.topath": "npm:4.5.9" "@types/object-hash": "npm:3.0.6" @@ -7252,7 +7216,7 @@ __metadata: peerDependencies: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -7331,19 +7295,20 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/delegate@npm:^10.0.11, @graphql-tools/delegate@npm:^10.0.12, @graphql-tools/delegate@npm:^10.0.17, @graphql-tools/delegate@npm:^10.0.4": - version: 10.0.17 - resolution: "@graphql-tools/delegate@npm:10.0.17" +"@graphql-tools/delegate@npm:^10.0.11, @graphql-tools/delegate@npm:^10.0.12, @graphql-tools/delegate@npm:^10.0.17, @graphql-tools/delegate@npm:^10.0.18, @graphql-tools/delegate@npm:^10.0.4": + version: 10.0.18 + resolution: "@graphql-tools/delegate@npm:10.0.18" dependencies: "@graphql-tools/batch-execute": "npm:^9.0.4" - "@graphql-tools/executor": "npm:^1.3.0" + "@graphql-tools/executor": "npm:^1.3.1" "@graphql-tools/schema": "npm:^10.0.4" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" + "@repeaterjs/repeater": "npm:^3.0.6" dataloader: "npm:^2.2.2" tslib: "npm:^2.5.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/c136026d328ce29d542077305a639d8f84c254b8ef40a9d187b410b3b5d93bbd1c51c424c4318c2df02e8e8a03bea1cf336268010b59d6c28168b3e5c0fa847d + checksum: 10c0/123744869454e7cb522db31d42643577e42c24314da1a5498434b4767a4e6584f46e38fbf1707ca60f9a4bc93464f5fdbfb4fbe75109fb0cd90fc6912c6c970e languageName: node linkType: hard @@ -7359,19 +7324,6 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/executor-envelop@npm:^3.0.0": - version: 3.0.0 - resolution: "@graphql-tools/executor-envelop@npm:3.0.0" - dependencies: - "@graphql-tools/utils": "npm:^10.0.13" - "@graphql-tools/wrap": "npm:^10.0.2" - tslib: "npm:^2.3.1" - peerDependencies: - "@envelop/core": ^3.0.4 || ^4.0.0 || ^5.0.0 - checksum: 10c0/d0c9a4c3235ea638d42e9bdd4201f2078dc8f9ab6c6cebd5f27992dec20d558066e6bc8dc42bd86910c6ab48942b5ed9c2c38be3bb0e77272cf5ab518edb3deb - languageName: node - linkType: hard - "@graphql-tools/executor-graphql-ws@npm:^1.1.2, @graphql-tools/executor-graphql-ws@npm:^1.2.0": version: 1.2.0 resolution: "@graphql-tools/executor-graphql-ws@npm:1.2.0" @@ -7420,32 +7372,18 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/executor-yoga@npm:^3.0.0": - version: 3.0.0 - resolution: "@graphql-tools/executor-yoga@npm:3.0.0" - dependencies: - "@graphql-tools/executor-envelop": "npm:^3.0.0" - "@graphql-tools/utils": "npm:^10.0.13" - tslib: "npm:^2.3.1" - peerDependencies: - graphql: ^15.2.0 || ^16.0.0 - graphql-yoga: ^3.5.1 || ^4.0.0 || ^5.0.0 - checksum: 10c0/89294bbe1c4e80f98e03b5b5c329b66bef9a90d0973cb85d9092b10cb37871f18b16a61bfba1eae7c2e18083418bf0e9fa8706a6f09273acc6b1edd2f33bac45 - languageName: node - linkType: hard - -"@graphql-tools/executor@npm:^1.2.8, @graphql-tools/executor@npm:^1.3.0": - version: 1.3.0 - resolution: "@graphql-tools/executor@npm:1.3.0" +"@graphql-tools/executor@npm:^1.2.8, @graphql-tools/executor@npm:^1.3.0, @graphql-tools/executor@npm:^1.3.1": + version: 1.3.1 + resolution: "@graphql-tools/executor@npm:1.3.1" dependencies: - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/utils": "npm:^10.3.4" "@graphql-typed-document-node/core": "npm:3.2.0" "@repeaterjs/repeater": "npm:^3.0.4" 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/0e4ec4bcd7ba3f4d0053ae59117fa0367ee9444839f2c0568058494abfa1b4196e53aa738c88cb68a02f30d0a73827578f7f5cb7125a874063a4f1331cd98d62 + checksum: 10c0/91a0e43be277e034a37fd0200aae40ef5dc7fb982c44a0b7eb8e14d09f6e43996ccadad4ceafb4e1aa7dfcd6148e9972a94efff57a544eea9c3ca537a3804c3b languageName: node linkType: hard @@ -7944,9 +7882,9 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/utils@npm:10.3.3, @graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.13, @graphql-tools/utils@npm:^10.0.3, @graphql-tools/utils@npm:^10.1.1, @graphql-tools/utils@npm:^10.2.1, @graphql-tools/utils@npm:^10.2.2, @graphql-tools/utils@npm:^10.2.3, @graphql-tools/utils@npm:^10.3.0, @graphql-tools/utils@npm:^10.3.2": - version: 10.3.3 - resolution: "@graphql-tools/utils@npm:10.3.3" +"@graphql-tools/utils@npm:10.3.4, @graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.13, @graphql-tools/utils@npm:^10.0.3, @graphql-tools/utils@npm:^10.1.1, @graphql-tools/utils@npm:^10.2.1, @graphql-tools/utils@npm:^10.2.2, @graphql-tools/utils@npm:^10.2.3, @graphql-tools/utils@npm:^10.3.0, @graphql-tools/utils@npm:^10.3.2, @graphql-tools/utils@npm:^10.3.4": + version: 10.3.4 + resolution: "@graphql-tools/utils@npm:10.3.4" dependencies: "@graphql-typed-document-node/core": "npm:^3.1.1" cross-inspect: "npm:1.0.1" @@ -7954,7 +7892,7 @@ __metadata: tslib: "npm:^2.4.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/9ac73505a42a7eb0569c9abe665df43470c4f25f89526f77618cf3e8bed0b0ebb23623b6e153d83ba13885b410271892857de755d30527761ba77a8980e45d29 + checksum: 10c0/15e50dbe40fdabfb132708f2a4f8213c280c1a39df9c13bde5d1d34f90c7e9d8964f646af2ce533603bed25190d60d925b40657441d991f4206b37e701cd8502 languageName: node linkType: hard @@ -9823,7 +9761,7 @@ __metadata: "@graphql-mesh/string-interpolation": "npm:0.5.5" "@graphql-mesh/transport-common": "npm:^0.4.7" "@graphql-mesh/transport-rest": "npm:^0.4.9" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@json-schema-tools/meta-schema": "npm:1.7.5" "@types/qs": "npm:6.9.15" "@types/to-json-schema": "npm:0.2.4" @@ -9844,7 +9782,7 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -9858,8 +9796,8 @@ __metadata: "@graphql-mesh/string-interpolation": "npm:^0.5.5" "@graphql-mesh/transport-mysql": "npm:^0.4.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" - "@graphql-tools/utils": "npm:^10.2.3" + "@graphql-tools/delegate": "npm:^10.0.18" + "@graphql-tools/utils": "npm:^10.3.4" "@types/graphql-fields": "npm:1.3.9" "@types/mysql": "npm:2.15.26" graphql-compose: "npm:^9.0.11" @@ -9878,7 +9816,7 @@ __metadata: resolution: "@omnigraph/neo4j@workspace:packages/loaders/neo4j" dependencies: "@graphql-mesh/transport-neo4j": "npm:^0.4.7" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@graphql-tools/schema": "npm:^10.0.4" "@neo4j/introspector": "npm:^3.0.0" neo4j-driver: "npm:^5.9.2" @@ -9894,8 +9832,8 @@ __metadata: resolution: "@omnigraph/openapi@workspace:packages/loaders/openapi" dependencies: "@graphql-mesh/string-interpolation": "npm:^0.5.5" - "@graphql-tools/delegate": "npm:^10.0.17" - "@graphql-tools/utils": "npm:10.3.3" + "@graphql-tools/delegate": "npm:^10.0.18" + "@graphql-tools/utils": "npm:10.3.4" "@omnigraph/json-schema": "npm:^0.103.2" "@whatwg-node/fetch": "npm:0.9.19" change-case: "npm:^4.1.2" @@ -9919,7 +9857,7 @@ __metadata: dependencies: "@ardatan/raml-1-parser": "npm:1.1.69" "@graphql-mesh/string-interpolation": "npm:0.5.5" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" "@omnigraph/json-schema": "npm:0.103.2" "@whatwg-node/fetch": "npm:^0.9.0" change-case: "npm:4.1.2" @@ -9929,7 +9867,7 @@ __metadata: "@graphql-mesh/cross-helpers": ^0.4.4 "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" tslib: ^2.4.0 languageName: unknown @@ -9950,7 +9888,7 @@ __metadata: peerDependencies: "@graphql-mesh/types": ^0.99.7 "@graphql-mesh/utils": ^0.99.7 - "@graphql-tools/utils": ^10.2.3 + "@graphql-tools/utils": ^10.3.4 graphql: "*" languageName: unknown linkType: soft @@ -9961,7 +9899,7 @@ __metadata: dependencies: "@graphql-mesh/cross-helpers": "npm:^0.4.4" "@graphql-mesh/types": "npm:^0.99.7" - "@graphql-tools/delegate": "npm:^10.0.17" + "@graphql-tools/delegate": "npm:^10.0.18" tuql: "npm:^1.7.0" peerDependencies: graphql: "*" @@ -9982,7 +9920,7 @@ __metadata: "@graphql-mesh/transport-thrift": "npm:^0.4.7" "@graphql-mesh/types": "npm:^0.99.7" "@graphql-mesh/utils": "npm:^0.99.7" - "@graphql-tools/utils": "npm:10.3.3" + "@graphql-tools/utils": "npm:10.3.4" "@whatwg-node/fetch": "npm:^0.9.18" graphql-scalars: "npm:^1.22.4" thrift: "npm:^0.20.0" @@ -13684,7 +13622,7 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:17.0.33": +"@types/yargs@npm:17.0.33, @types/yargs@npm:^17.0.8": version: 17.0.33 resolution: "@types/yargs@npm:17.0.33" dependencies: @@ -13702,15 +13640,6 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:^17.0.8": - version: 17.0.32 - resolution: "@types/yargs@npm:17.0.32" - dependencies: - "@types/yargs-parser": "npm:*" - checksum: 10c0/2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf - languageName: node - linkType: hard - "@typescript-eslint/eslint-plugin@npm:8.0.1": version: 8.0.1 resolution: "@typescript-eslint/eslint-plugin@npm:8.0.1"