Merge branch 'main' into next

Author: trevor-scheer

.changeset/brave-masks-lick.md

@@ -1,5 +1,12 @@
 # CHANGELOG for `@apollo/composition`
 
+## 2.4.9
+### Patch Changes
+
+- Updated dependencies [[`7ac83456`](https://github.com/apollographql/federation/commit/7ac834568d57a9b9e63002353543d32f6e97b4a5), [`d60349b3`](https://github.com/apollographql/federation/commit/d60349b3fa7e5ba1f64c1727d88dc6faec21a38a), [`1bb7c512`](https://github.com/apollographql/federation/commit/1bb7c5129c7b07627ea33684b538fda8a83b8da8), [`02eab3ac`](https://github.com/apollographql/federation/commit/02eab3ac4a0514bef8f9253a9e43418ba1c17843), [`fd4545c2`](https://github.com/apollographql/federation/commit/fd4545c27ef343ad14436f9541f539ef80bacafa)]:
+  - @apollo/query-graphs@2.4.9
+  - @apollo/federation-internals@2.4.9
+
 ## 2.4.8
 ### Patch Changes
 

.changeset/friendly-lies-protect.md

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/composition",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "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.8",
-    "@apollo/query-graphs": "2.4.8"
+    "@apollo/federation-internals": "2.4.9",
+    "@apollo/query-graphs": "2.4.9"
   },
   "peerDependencies": {
     "graphql": "^16.5.0"

.changeset/olive-bees-build.md

@@ -1,5 +1,7 @@
 # CHANGELOG for `federation-integration-testsuite-js`
 
+## 2.4.9
+
 ## 2.4.8
 
 ## 2.4.7

.changeset/rotten-ants-clean.md

@@ -1,7 +1,7 @@
 {
   "name": "apollo-federation-integration-testsuite",
   "private": true,
-  "version": "2.4.8",
+  "version": "2.4.9",
   "description": "Apollo Federation Integrations / Test Fixtures",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

.changeset/stale-birds-think.md

@@ -1,5 +1,16 @@
 # CHANGELOG for `@apollo/gateway`
 
+## 2.4.9
+### Patch Changes
+
+
+- Try reusing named fragments in subgraph fetches even if those fragment only apply partially to the subgraph. Before this change, only named fragments that were applying entirely to a subgraph were tried, leading to less reuse that expected. Concretely, this change can sometimes allow the generation of smaller subgraph fetches. ([#2639](https://github.com/apollographql/federation/pull/2639))
+
+- Updated dependencies [[`7ac83456`](https://github.com/apollographql/federation/commit/7ac834568d57a9b9e63002353543d32f6e97b4a5), [`d60349b3`](https://github.com/apollographql/federation/commit/d60349b3fa7e5ba1f64c1727d88dc6faec21a38a), [`1bb7c512`](https://github.com/apollographql/federation/commit/1bb7c5129c7b07627ea33684b538fda8a83b8da8), [`02eab3ac`](https://github.com/apollographql/federation/commit/02eab3ac4a0514bef8f9253a9e43418ba1c17843), [`fd4545c2`](https://github.com/apollographql/federation/commit/fd4545c27ef343ad14436f9541f539ef80bacafa)]:
+  - @apollo/query-planner@2.4.9
+  - @apollo/federation-internals@2.4.9
+  - @apollo/composition@2.4.9
+
 ## 2.4.8
 ### Patch Changes
 

.changeset/violet-rice-cheer.md

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "description": "Apollo Gateway",
   "author": "Apollo <[email protected]>",
   "main": "dist/index.js",
@@ -25,9 +25,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/composition": "2.4.8",
-    "@apollo/federation-internals": "2.4.8",
-    "@apollo/query-planner": "2.4.8",
+    "@apollo/composition": "2.4.9",
+    "@apollo/federation-internals": "2.4.9",
+    "@apollo/query-planner": "2.4.9",
     "@apollo/server-gateway-interface": "^1.1.0",
     "@apollo/usage-reporting-protobuf": "^4.1.0",
     "@apollo/utils.createhash": "^2.0.0",

composition-js/CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG for `@apollo/federation-internals`
 
+## 2.4.9
+### Patch Changes
+
+
+- Improves query planning time in some situations where entities use multiple keys. ([#2610](https://github.com/apollographql/federation/pull/2610))
+
+
+- Try reusing named fragments in subgraph fetches even if those fragment only apply partially to the subgraph. Before this change, only named fragments that were applying entirely to a subgraph were tried, leading to less reuse that expected. Concretely, this change can sometimes allow the generation of smaller subgraph fetches. ([#2639](https://github.com/apollographql/federation/pull/2639))
+
+
+- Fix issue in the code to reuse fragments that, in some rare circumstances, could led to invalid queries where a named ([#2659](https://github.com/apollographql/federation/pull/2659))
+  spread was use in an invalid position. If triggered, this resulted in an subgraph fetch whereby a named spread was
+  used inside a sub-selection even though the spread condition did not intersect the parent type (the exact error message
+  would depend on the client library used to handle subgraph fetches, but with GraphQL-js, the error message had the
+  form "Fragment <F> cannot be spread here as objects of type <X> can never be of type <Y>").
+
+- Fix regression in named fragment reuse introduced by 2.4.8 that caused fragments that were only used by other fragments ([#2648](https://github.com/apollographql/federation/pull/2648))
+  to not be reused, even if they are making the overall query smaller and thus should be reused.
+
+- Fix unnecessary busy work in the code extracting subgraphs from supergraphs. This code is executing when a new ([#2654](https://github.com/apollographql/federation/pull/2654))
+  supergraph is deployed, and can impact gateway clients when it runs. This is often not a problem, but for
+  large supergraphs with lots of subgraphs, an obvious inefficiency could make the code take much longer than
+  it should have.
+
 ## 2.4.8
 ### Patch Changes
 

composition-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/federation-internals",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "description": "Apollo Federation internal utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",