From 066b6e635c16e2dcc8bcf218b9ca17821bc545d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 15:24:46 -0500 Subject: [PATCH] Version Packages (#2599) Co-authored-by: github-actions[bot] --- .changeset/brave-dryers-drop.md | 9 ------ .changeset/nasty-panthers-chew.md | 9 ------ .changeset/tender-bears-call.md | 9 ------ composition-js/CHANGELOG.md | 7 ++++ composition-js/package.json | 6 ++-- .../CHANGELOG.md | 2 ++ .../package.json | 2 +- gateway-js/CHANGELOG.md | 8 +++++ gateway-js/package.json | 8 ++--- internals-js/CHANGELOG.md | 12 +++++++ internals-js/package.json | 2 +- package-lock.json | 32 +++++++++---------- query-graphs-js/CHANGELOG.md | 6 ++++ query-graphs-js/package.json | 4 +-- query-planner-js/CHANGELOG.md | 20 ++++++++++++ query-planner-js/package.json | 6 ++-- subgraph-js/CHANGELOG.md | 6 ++++ subgraph-js/package.json | 4 +-- 18 files changed, 93 insertions(+), 59 deletions(-) delete mode 100644 .changeset/brave-dryers-drop.md delete mode 100644 .changeset/nasty-panthers-chew.md delete mode 100644 .changeset/tender-bears-call.md diff --git a/.changeset/brave-dryers-drop.md b/.changeset/brave-dryers-drop.md deleted file mode 100644 index 1c7c29d9c..000000000 --- a/.changeset/brave-dryers-drop.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -"@apollo/query-planner": patch -"@apollo/federation-internals": patch ---- - -Fix assertion error in some overlapping fragment cases. In some cases, when fragments overlaps on some sub-selections -and some interface field implementation relied on sub-typing, an assertion error could be raised with a message of -the form `Cannot add selection of field X to selection set of parent type Y` and this fixes this problem. - \ No newline at end of file diff --git a/.changeset/nasty-panthers-chew.md b/.changeset/nasty-panthers-chew.md deleted file mode 100644 index ff24dd85a..000000000 --- a/.changeset/nasty-panthers-chew.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -"@apollo/query-planner": patch ---- - -Adds `debug.maxEvaluatedPlans` query planning configuration options. This option limits the maximum number of query plan -that may have to be evaluated during a query planning phase, thus capping the maximum query planning runtime, but at the -price of potentially reducing the optimality of the generated query plan (which may mean slower query executions). This -option is exposed for debugging purposes, but it is recommended to rely on the default in production. - diff --git a/.changeset/tender-bears-call.md b/.changeset/tender-bears-call.md deleted file mode 100644 index 3dd85dfb8..000000000 --- a/.changeset/tender-bears-call.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -"@apollo/query-planner": patch -"@apollo/federation-internals": patch ---- - -Fix possible fragment-related assertion error during query planning. This prevents a rare case where an assertion with a -message of the form `Cannot add fragment of condition X (runtimes: ...) to parent type Y (runtimes: ...)` could fail -during query planning. - \ No newline at end of file diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md index 1e810c152..51bae8f9c 100644 --- a/composition-js/CHANGELOG.md +++ b/composition-js/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG for `@apollo/composition` +## 2.4.6 +### Patch Changes + +- Updated dependencies [[`5cd17e69`](https://github.com/apollographql/federation/commit/5cd17e6965664768c9d9f5b734634764bbebf2e7), [`e136ad87`](https://github.com/apollographql/federation/commit/e136ad87db6005ddd8100f98022a043c0846f38e)]: + - @apollo/federation-internals@2.4.6 + - @apollo/query-graphs@2.4.6 + ## 2.4.5 ### Patch Changes diff --git a/composition-js/package.json b/composition-js/package.json index 0e75ed09f..a7b0acd6a 100644 --- a/composition-js/package.json +++ b/composition-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/composition", - "version": "2.4.5", + "version": "2.4.6", "description": "Apollo Federation composition utilities", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -27,8 +27,8 @@ "access": "public" }, "dependencies": { - "@apollo/federation-internals": "2.4.5", - "@apollo/query-graphs": "2.4.5" + "@apollo/federation-internals": "2.4.6", + "@apollo/query-graphs": "2.4.6" }, "peerDependencies": { "graphql": "^16.5.0" diff --git a/federation-integration-testsuite-js/CHANGELOG.md b/federation-integration-testsuite-js/CHANGELOG.md index 6b8e96185..8f49656b3 100644 --- a/federation-integration-testsuite-js/CHANGELOG.md +++ b/federation-integration-testsuite-js/CHANGELOG.md @@ -1,5 +1,7 @@ # CHANGELOG for `federation-integration-testsuite-js` +## 2.4.6 + ## 2.4.5 ### Patch Changes diff --git a/federation-integration-testsuite-js/package.json b/federation-integration-testsuite-js/package.json index 94cdf3f0f..79ebf7a89 100644 --- a/federation-integration-testsuite-js/package.json +++ b/federation-integration-testsuite-js/package.json @@ -1,7 +1,7 @@ { "name": "apollo-federation-integration-testsuite", "private": true, - "version": "2.4.5", + "version": "2.4.6", "description": "Apollo Federation Integrations / Test Fixtures", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/gateway-js/CHANGELOG.md b/gateway-js/CHANGELOG.md index 27392a1ec..2f63e68ba 100644 --- a/gateway-js/CHANGELOG.md +++ b/gateway-js/CHANGELOG.md @@ -1,5 +1,13 @@ # CHANGELOG for `@apollo/gateway` +## 2.4.6 +### Patch Changes + +- Updated dependencies [[`5cd17e69`](https://github.com/apollographql/federation/commit/5cd17e6965664768c9d9f5b734634764bbebf2e7), [`8ca107ac`](https://github.com/apollographql/federation/commit/8ca107ac2f19dde5cb64844355a0f7a5296b9008), [`e136ad87`](https://github.com/apollographql/federation/commit/e136ad87db6005ddd8100f98022a043c0846f38e)]: + - @apollo/query-planner@2.4.6 + - @apollo/federation-internals@2.4.6 + - @apollo/composition@2.4.6 + ## 2.4.5 ### Patch Changes diff --git a/gateway-js/package.json b/gateway-js/package.json index 6acc90d13..309cc50a5 100644 --- a/gateway-js/package.json +++ b/gateway-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "2.4.5", + "version": "2.4.6", "description": "Apollo Gateway", "author": "Apollo ", "main": "dist/index.js", @@ -25,9 +25,9 @@ "access": "public" }, "dependencies": { - "@apollo/composition": "2.4.5", - "@apollo/federation-internals": "2.4.5", - "@apollo/query-planner": "2.4.5", + "@apollo/composition": "2.4.6", + "@apollo/federation-internals": "2.4.6", + "@apollo/query-planner": "2.4.6", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", diff --git a/internals-js/CHANGELOG.md b/internals-js/CHANGELOG.md index fad6e8fd6..577adf554 100644 --- a/internals-js/CHANGELOG.md +++ b/internals-js/CHANGELOG.md @@ -1,5 +1,17 @@ # CHANGELOG for `@apollo/federation-internals` +## 2.4.6 +### Patch Changes + + +- Fix assertion error in some overlapping fragment cases. In some cases, when fragments overlaps on some sub-selections ([#2594](https://github.com/apollographql/federation/pull/2594)) + and some interface field implementation relied on sub-typing, an assertion error could be raised with a message of + the form `Cannot add selection of field X to selection set of parent type Y` and this fixes this problem. + +- Fix possible fragment-related assertion error during query planning. This prevents a rare case where an assertion with a ([#2596](https://github.com/apollographql/federation/pull/2596)) + message of the form `Cannot add fragment of condition X (runtimes: ...) to parent type Y (runtimes: ...)` could fail + during query planning. + ## 2.4.5 ### Patch Changes diff --git a/internals-js/package.json b/internals-js/package.json index 97740d74c..fdf32b47e 100644 --- a/internals-js/package.json +++ b/internals-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation-internals", - "version": "2.4.5", + "version": "2.4.6", "description": "Apollo Federation internal utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/package-lock.json b/package-lock.json index 51b2a8787..21a40930c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,11 +69,11 @@ }, "composition-js": { "name": "@apollo/composition", - "version": "2.4.5", + "version": "2.4.6", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { - "@apollo/federation-internals": "2.4.5", - "@apollo/query-graphs": "2.4.5" + "@apollo/federation-internals": "2.4.6", + "@apollo/query-graphs": "2.4.6" }, "engines": { "node": ">=14.15.0" @@ -84,7 +84,7 @@ }, "federation-integration-testsuite-js": { "name": "apollo-federation-integration-testsuite", - "version": "2.4.5", + "version": "2.4.6", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { "graphql-tag": "^2.12.6", @@ -93,12 +93,12 @@ }, "gateway-js": { "name": "@apollo/gateway", - "version": "2.4.5", + "version": "2.4.6", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { - "@apollo/composition": "2.4.5", - "@apollo/federation-internals": "2.4.5", - "@apollo/query-planner": "2.4.5", + "@apollo/composition": "2.4.6", + "@apollo/federation-internals": "2.4.6", + "@apollo/query-planner": "2.4.6", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", @@ -124,7 +124,7 @@ }, "internals-js": { "name": "@apollo/federation-internals", - "version": "2.4.5", + "version": "2.4.6", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { "@types/uuid": "^9.0.0", @@ -17315,10 +17315,10 @@ }, "query-graphs-js": { "name": "@apollo/query-graphs", - "version": "2.4.5", + "version": "2.4.6", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { - "@apollo/federation-internals": "2.4.5", + "@apollo/federation-internals": "2.4.6", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -17332,11 +17332,11 @@ }, "query-planner-js": { "name": "@apollo/query-planner", - "version": "2.4.5", + "version": "2.4.6", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { - "@apollo/federation-internals": "2.4.5", - "@apollo/query-graphs": "2.4.5", + "@apollo/federation-internals": "2.4.6", + "@apollo/query-graphs": "2.4.6", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", @@ -17365,11 +17365,11 @@ }, "subgraph-js": { "name": "@apollo/subgraph", - "version": "2.4.5", + "version": "2.4.6", "license": "MIT", "dependencies": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.4.5" + "@apollo/federation-internals": "2.4.6" }, "engines": { "node": ">=14.15.0" diff --git a/query-graphs-js/CHANGELOG.md b/query-graphs-js/CHANGELOG.md index d40807730..3860438ee 100644 --- a/query-graphs-js/CHANGELOG.md +++ b/query-graphs-js/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG for `@apollo/query-graphs` +## 2.4.6 +### Patch Changes + +- Updated dependencies [[`5cd17e69`](https://github.com/apollographql/federation/commit/5cd17e6965664768c9d9f5b734634764bbebf2e7), [`e136ad87`](https://github.com/apollographql/federation/commit/e136ad87db6005ddd8100f98022a043c0846f38e)]: + - @apollo/federation-internals@2.4.6 + ## 2.4.5 ### Patch Changes diff --git a/query-graphs-js/package.json b/query-graphs-js/package.json index 1c6287b29..5d06e10fc 100644 --- a/query-graphs-js/package.json +++ b/query-graphs-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/query-graphs", - "version": "2.4.5", + "version": "2.4.6", "description": "Apollo Federation library to work with 'query graphs'", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -23,7 +23,7 @@ "node": ">=14.15.0" }, "dependencies": { - "@apollo/federation-internals": "2.4.5", + "@apollo/federation-internals": "2.4.6", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" diff --git a/query-planner-js/CHANGELOG.md b/query-planner-js/CHANGELOG.md index 9ab070597..e39b22af5 100644 --- a/query-planner-js/CHANGELOG.md +++ b/query-planner-js/CHANGELOG.md @@ -1,5 +1,25 @@ # CHANGELOG for `@apollo/query-planner` +## 2.4.6 +### Patch Changes + + +- Fix assertion error in some overlapping fragment cases. In some cases, when fragments overlaps on some sub-selections ([#2594](https://github.com/apollographql/federation/pull/2594)) + and some interface field implementation relied on sub-typing, an assertion error could be raised with a message of + the form `Cannot add selection of field X to selection set of parent type Y` and this fixes this problem. + +- Adds `debug.maxEvaluatedPlans` query planning configuration options. This option limits the maximum number of query plan ([#2593](https://github.com/apollographql/federation/pull/2593)) + that may have to be evaluated during a query planning phase, thus capping the maximum query planning runtime, but at the + price of potentially reducing the optimality of the generated query plan (which may mean slower query executions). This + option is exposed for debugging purposes, but it is recommended to rely on the default in production. + +- Fix possible fragment-related assertion error during query planning. This prevents a rare case where an assertion with a ([#2596](https://github.com/apollographql/federation/pull/2596)) + message of the form `Cannot add fragment of condition X (runtimes: ...) to parent type Y (runtimes: ...)` could fail + during query planning. +- Updated dependencies [[`5cd17e69`](https://github.com/apollographql/federation/commit/5cd17e6965664768c9d9f5b734634764bbebf2e7), [`e136ad87`](https://github.com/apollographql/federation/commit/e136ad87db6005ddd8100f98022a043c0846f38e)]: + - @apollo/federation-internals@2.4.6 + - @apollo/query-graphs@2.4.6 + ## 2.4.5 ### Patch Changes diff --git a/query-planner-js/package.json b/query-planner-js/package.json index 38a34a267..8cd015a6e 100644 --- a/query-planner-js/package.json +++ b/query-planner-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/query-planner", - "version": "2.4.5", + "version": "2.4.6", "description": "Apollo Query Planner", "author": "Apollo ", "main": "dist/index.js", @@ -25,8 +25,8 @@ "access": "public" }, "dependencies": { - "@apollo/federation-internals": "2.4.5", - "@apollo/query-graphs": "2.4.5", + "@apollo/federation-internals": "2.4.6", + "@apollo/query-graphs": "2.4.6", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", diff --git a/subgraph-js/CHANGELOG.md b/subgraph-js/CHANGELOG.md index f6eaa3915..656b500ab 100644 --- a/subgraph-js/CHANGELOG.md +++ b/subgraph-js/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG for `@apollo/subgraph` +## 2.4.6 +### Patch Changes + +- Updated dependencies [[`5cd17e69`](https://github.com/apollographql/federation/commit/5cd17e6965664768c9d9f5b734634764bbebf2e7), [`e136ad87`](https://github.com/apollographql/federation/commit/e136ad87db6005ddd8100f98022a043c0846f38e)]: + - @apollo/federation-internals@2.4.6 + ## 2.4.5 ### Patch Changes diff --git a/subgraph-js/package.json b/subgraph-js/package.json index b81c30ebe..f042e60cf 100644 --- a/subgraph-js/package.json +++ b/subgraph-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/subgraph", - "version": "2.4.5", + "version": "2.4.6", "description": "Apollo Subgraph Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -25,7 +25,7 @@ }, "dependencies": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.4.5" + "@apollo/federation-internals": "2.4.6" }, "peerDependencies": { "graphql": "^16.5.0"