diff --git a/.changeset/invalid-reused-fragment.md b/.changeset/invalid-reused-fragment.md deleted file mode 100644 index 6fc78c270..000000000 --- a/.changeset/invalid-reused-fragment.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@apollo/query-planner": patch -"@apollo/composition": patch -"@apollo/federation-internals": patch ---- - -Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](https://github.com/apollographql/federation/issues/2952)) diff --git a/.changeset/olive-papayas-act.md b/.changeset/olive-papayas-act.md deleted file mode 100644 index 6a845e28e..000000000 --- a/.changeset/olive-papayas-act.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -"@apollo/query-planner": patch ---- - -Type conditioned fetching - -When querying a field that is in a path of 2 or more unions, the query planner was not able to handle different selections and would aggressively collapse selections in fetches yielding an incorrect plan. - -This change introduces new syntax to express type conditions in (key and flatten) paths. Type conditioned fetching can be enabled through a flag, and execution is supported in the router only. (#2938) diff --git a/.changeset/six-shoes-fly.md b/.changeset/six-shoes-fly.md deleted file mode 100644 index d3fd47310..000000000 --- a/.changeset/six-shoes-fly.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@apollo/query-planner": patch -"@apollo/federation-internals": patch ---- - -Fixed query planner to pass the directives from original query to subgraph operations (#2961) diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md index 7ba9c6376..1e19f6703 100644 --- a/composition-js/CHANGELOG.md +++ b/composition-js/CHANGELOG.md @@ -1,5 +1,15 @@ # CHANGELOG for `@apollo/composition` +## 2.7.3 + +### Patch Changes + +- Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](https://github.com/apollographql/federation/issues/2952)) ([#2963](https://github.com/apollographql/federation/pull/2963)) + +- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]: + - @apollo/federation-internals@2.7.3 + - @apollo/query-graphs@2.7.3 + ## 2.7.2 ### Patch Changes diff --git a/composition-js/package.json b/composition-js/package.json index 17d811361..6fc6f3e09 100644 --- a/composition-js/package.json +++ b/composition-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/composition", - "version": "2.7.2", + "version": "2.7.3", "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.7.2", - "@apollo/query-graphs": "2.7.2" + "@apollo/federation-internals": "2.7.3", + "@apollo/query-graphs": "2.7.3" }, "peerDependencies": { "graphql": "^16.5.0" diff --git a/federation-integration-testsuite-js/CHANGELOG.md b/federation-integration-testsuite-js/CHANGELOG.md index b77ed0659..bc013b8c9 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.7.3 + ## 2.7.2 ### Patch Changes diff --git a/federation-integration-testsuite-js/package.json b/federation-integration-testsuite-js/package.json index 415248479..33a58f241 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.7.2", + "version": "2.7.3", "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 b74e6a5a6..82e6d41d4 100644 --- a/gateway-js/CHANGELOG.md +++ b/gateway-js/CHANGELOG.md @@ -1,5 +1,14 @@ # CHANGELOG for `@apollo/gateway` +## 2.7.3 + +### Patch Changes + +- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`3e2c845c74407a136b9e0066e44c1ad1467d3013`](https://github.com/apollographql/federation/commit/3e2c845c74407a136b9e0066e44c1ad1467d3013), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]: + - @apollo/query-planner@2.7.3 + - @apollo/composition@2.7.3 + - @apollo/federation-internals@2.7.3 + ## 2.7.2 ### Patch Changes diff --git a/gateway-js/package.json b/gateway-js/package.json index dfe5b26d7..b4ed25602 100644 --- a/gateway-js/package.json +++ b/gateway-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "2.7.2", + "version": "2.7.3", "description": "Apollo Gateway", "author": "Apollo ", "main": "dist/index.js", @@ -25,9 +25,9 @@ "access": "public" }, "dependencies": { - "@apollo/composition": "2.7.2", - "@apollo/federation-internals": "2.7.2", - "@apollo/query-planner": "2.7.2", + "@apollo/composition": "2.7.3", + "@apollo/federation-internals": "2.7.3", + "@apollo/query-planner": "2.7.3", "@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 17cf9c696..bbfd4d1ea 100644 --- a/internals-js/CHANGELOG.md +++ b/internals-js/CHANGELOG.md @@ -1,5 +1,13 @@ # CHANGELOG for `@apollo/federation-internals` +## 2.7.3 + +### Patch Changes + +- Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](https://github.com/apollographql/federation/issues/2952)) ([#2963](https://github.com/apollographql/federation/pull/2963)) + +- Fixed query planner to pass the directives from original query to subgraph operations (#2961) ([#2967](https://github.com/apollographql/federation/pull/2967)) + ## 2.7.2 ### Patch Changes diff --git a/internals-js/package.json b/internals-js/package.json index 133939660..982830bab 100644 --- a/internals-js/package.json +++ b/internals-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation-internals", - "version": "2.7.2", + "version": "2.7.3", "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 750c14322..e4c8737cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,11 +70,11 @@ }, "composition-js": { "name": "@apollo/composition", - "version": "2.7.2", + "version": "2.7.3", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.7.2", - "@apollo/query-graphs": "2.7.2" + "@apollo/federation-internals": "2.7.3", + "@apollo/query-graphs": "2.7.3" }, "engines": { "node": ">=14.15.0" @@ -85,7 +85,7 @@ }, "federation-integration-testsuite-js": { "name": "apollo-federation-integration-testsuite", - "version": "2.7.2", + "version": "2.7.3", "license": "Elastic-2.0", "dependencies": { "graphql-tag": "^2.12.6", @@ -94,12 +94,12 @@ }, "gateway-js": { "name": "@apollo/gateway", - "version": "2.7.2", + "version": "2.7.3", "license": "Elastic-2.0", "dependencies": { - "@apollo/composition": "2.7.2", - "@apollo/federation-internals": "2.7.2", - "@apollo/query-planner": "2.7.2", + "@apollo/composition": "2.7.3", + "@apollo/federation-internals": "2.7.3", + "@apollo/query-planner": "2.7.3", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", @@ -125,7 +125,7 @@ }, "internals-js": { "name": "@apollo/federation-internals", - "version": "2.7.2", + "version": "2.7.3", "license": "Elastic-2.0", "dependencies": { "@types/uuid": "^9.0.0", @@ -17827,10 +17827,10 @@ }, "query-graphs-js": { "name": "@apollo/query-graphs", - "version": "2.7.2", + "version": "2.7.3", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.7.2", + "@apollo/federation-internals": "2.7.3", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -17844,11 +17844,11 @@ }, "query-planner-js": { "name": "@apollo/query-planner", - "version": "2.7.2", + "version": "2.7.3", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.7.2", - "@apollo/query-graphs": "2.7.2", + "@apollo/federation-internals": "2.7.3", + "@apollo/query-graphs": "2.7.3", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", @@ -17877,11 +17877,11 @@ }, "subgraph-js": { "name": "@apollo/subgraph", - "version": "2.7.2", + "version": "2.7.3", "license": "MIT", "dependencies": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.7.2" + "@apollo/federation-internals": "2.7.3" }, "engines": { "node": ">=14.15.0" diff --git a/query-graphs-js/CHANGELOG.md b/query-graphs-js/CHANGELOG.md index 2991b57f5..cc1fad9b8 100644 --- a/query-graphs-js/CHANGELOG.md +++ b/query-graphs-js/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG for `@apollo/query-graphs` +## 2.7.3 + +### Patch Changes + +- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]: + - @apollo/federation-internals@2.7.3 + ## 2.7.2 ### Patch Changes diff --git a/query-graphs-js/package.json b/query-graphs-js/package.json index 68fce655a..c5e0302aa 100644 --- a/query-graphs-js/package.json +++ b/query-graphs-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/query-graphs", - "version": "2.7.2", + "version": "2.7.3", "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.7.2", + "@apollo/federation-internals": "2.7.3", "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 86c25d132..47ce90c48 100644 --- a/query-planner-js/CHANGELOG.md +++ b/query-planner-js/CHANGELOG.md @@ -1,5 +1,23 @@ # CHANGELOG for `@apollo/query-planner` +## 2.7.3 + +### Patch Changes + +- Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](https://github.com/apollographql/federation/issues/2952)) ([#2963](https://github.com/apollographql/federation/pull/2963)) + +- Type conditioned fetching ([#2949](https://github.com/apollographql/federation/pull/2949)) + + When querying a field that is in a path of 2 or more unions, the query planner was not able to handle different selections and would aggressively collapse selections in fetches yielding an incorrect plan. + + This change introduces new syntax to express type conditions in (key and flatten) paths. Type conditioned fetching can be enabled through a flag, and execution is supported in the router only. (#2938) + +- Fixed query planner to pass the directives from original query to subgraph operations (#2961) ([#2967](https://github.com/apollographql/federation/pull/2967)) + +- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]: + - @apollo/federation-internals@2.7.3 + - @apollo/query-graphs@2.7.3 + ## 2.7.2 ### Patch Changes diff --git a/query-planner-js/package.json b/query-planner-js/package.json index a6a755aec..9c0433e99 100644 --- a/query-planner-js/package.json +++ b/query-planner-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/query-planner", - "version": "2.7.2", + "version": "2.7.3", "description": "Apollo Query Planner", "author": "Apollo ", "main": "dist/index.js", @@ -25,8 +25,8 @@ "access": "public" }, "dependencies": { - "@apollo/federation-internals": "2.7.2", - "@apollo/query-graphs": "2.7.2", + "@apollo/federation-internals": "2.7.3", + "@apollo/query-graphs": "2.7.3", "@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 76ddaa6ee..457e6813f 100644 --- a/subgraph-js/CHANGELOG.md +++ b/subgraph-js/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG for `@apollo/subgraph` +## 2.7.3 + +### Patch Changes + +- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]: + - @apollo/federation-internals@2.7.3 + ## 2.7.2 ### Patch Changes diff --git a/subgraph-js/package.json b/subgraph-js/package.json index a2bdd1eac..bc75f8903 100644 --- a/subgraph-js/package.json +++ b/subgraph-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/subgraph", - "version": "2.7.2", + "version": "2.7.3", "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.7.2" + "@apollo/federation-internals": "2.7.3" }, "peerDependencies": { "graphql": "^16.5.0"