chore: upgrade apollo-compiler to v2.0.0-beta.0

Adopts the 2025 GraphQL spec updates: Operation, Fragment, and
VariableDefinition now carry an optional description field. Also
renames response_key() to response_name() and FieldError to
ExecutionError per the new API.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: tninesling

Cargo.lock

@@ -184,7 +184,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b877306ffde4d3cc428bbc8f506fdd67b99255298ae92b919954c0c52f530504"
 dependencies = [
  "ahash",
- "apollo-parser",
+ "apollo-parser 0.8.6",
+ "ariadne",
+ "futures",
+ "indexmap 2.14.0",
+ "rowan",
+ "serde",
+ "serde_json_bytes",
+ "thiserror 2.0.20",
+ "triomphe",
+ "typed-arena",
+]
+
+[[package]]
+name = "apollo-compiler"
+version = "2.0.0-beta.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5f6d0efa38a950a9429c90ccb422a68f4a382e5b67abd5ff9a6b8885d787c84"
+dependencies = [
+ "ahash",
+ "apollo-parser 0.9.0-beta.0",
  "ariadne",
  "futures",
  "indexmap 2.14.0",
@@ -279,9 +298,9 @@ name = "apollo-federation"
 version = "2.17.0"
 dependencies = [
  "ahash",
- "apollo-compiler",
+ "apollo-compiler 2.0.0-beta.0",
  "apollo-federation",
- "apollo-parser",
+ "apollo-parser 0.9.0-beta.0",
  "clap",
  "derive_more",
  "dhat",
@@ -331,7 +350,7 @@ name = "apollo-federation-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "apollo-compiler",
+ "apollo-compiler 2.0.0-beta.0",
  "apollo-federation",
  "clap",
  "insta",
@@ -412,6 +431,17 @@ dependencies = [
  "thiserror 2.0.20",
 ]
 
+[[package]]
+name = "apollo-parser"
+version = "0.9.0-beta.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c72cf951e113a1a27378bdddb82ccf08bbe2f49436cf597eb851ae8cb012ea3"
+dependencies = [
+ "memchr",
+ "rowan",
+ "thiserror 2.0.20",
+]
+
 [[package]]
 name = "apollo-qos"
 version = "0.5.1"
@@ -451,7 +481,7 @@ dependencies = [
  "addr2line 0.27.1",
  "ahash",
  "anyhow",
- "apollo-compiler",
+ "apollo-compiler 2.0.0-beta.0",
  "apollo-environment-detector",
  "apollo-errors",
  "apollo-federation",
@@ -624,7 +654,7 @@ dependencies = [
 name = "apollo-router-benchmarks"
 version = "2.17.0"
 dependencies = [
- "apollo-parser",
+ "apollo-parser 0.9.0-beta.0",
  "apollo-router",
  "apollo-smith",
  "arbitrary",
@@ -663,12 +693,12 @@ dependencies = [
 
 [[package]]
 name = "apollo-smith"
-version = "0.16.0"
+version = "0.17.0-beta.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "231b846cb1c3fd7c15d1a96eeab979883105ca1be4e238ee9cdad32658984c18"
+checksum = "c75e0aa74f34bd906db5b991ef9e4d8ea5c85011f333affd2ca11684366395b7"
 dependencies = [
- "apollo-compiler",
- "apollo-parser",
+ "apollo-compiler 2.0.0-beta.0",
+ "apollo-parser 0.9.0-beta.0",
  "arbitrary",
  "indexmap 2.14.0",
  "once_cell",
@@ -2531,7 +2561,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -2785,7 +2815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -3902,7 +3932,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.6.3",
  "tokio",
  "tower-service",
  "tracing",
@@ -4949,7 +4979,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -6615,7 +6645,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "apollo-federation",
- "apollo-parser",
+ "apollo-parser 0.9.0-beta.0",
  "apollo-router",
  "apollo-smith",
  "async-trait",
@@ -6779,7 +6809,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -6846,7 +6876,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -7201,11 +7231,11 @@ dependencies = [
 
 [[package]]
 name = "shape"
-version = "0.8.0"
+version = "0.9.0-preview.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8687837087ee58ab3479bbbf80dd7b2c119a523ddf8b439317078fb22265896f"
+checksum = "0ac234112195c859e0acdd79d080ff8359e84d91025a0ecb802a548295f16168"
 dependencies = [
- "apollo-compiler",
+ "apollo-compiler 2.0.0-beta.0",
  "indexmap 2.14.0",
  "serde_json",
  "serde_json_bytes",
@@ -7369,7 +7399,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -7509,7 +7539,7 @@ name = "supergraph_sdl"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "apollo-compiler",
+ "apollo-compiler 1.32.0",
  "apollo-router",
  "async-trait",
  "tower",
@@ -7669,10 +7699,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.2",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -7682,7 +7712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874"
 dependencies = [
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -8873,7 +8903,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]

Cargo.toml

@@ -48,9 +48,9 @@ debug = 1
 # https://doc.rust-lang.org/cargo/reference/workspaces.html#the-dependencies-table
 [workspace.dependencies]
 ahash = "0.8.11"
-apollo-compiler = "1.32.0"
-apollo-parser = "0.8.6"
-apollo-smith = "0.16.0"
+apollo-compiler = "=2.0.0-beta.0"
+apollo-parser = "=0.9.0-beta.0"
+apollo-smith = "=0.17.0-beta.0"
 async-trait = "0.1.77"
 encoding_rs = "0.8"
 heck = "0.5.0"

apollo-federation/Cargo.toml

@@ -59,7 +59,7 @@ url = "2"
 either = "1.13.0"
 tracing = "0.1.40"
 ron = { version = "0.12.0", optional = true }
-shape = "=0.8.0"
+shape = "=0.9.0-preview.0"
 form_urlencoded = "1.2.1"
 parking_lot = "0.12.4"
 mime = "0.3.17"

apollo-federation/src/correctness/response_shape.rs

@@ -1055,7 +1055,7 @@ impl ResponseShapeContext {
         // Record this selection's definition.
         let value = response_shape
             .definitions_per_response_key
-            .entry(field.response_key().clone())
+            .entry(field.response_name().clone())
             .or_default();
         value.insert_possible_definition(
             self.type_condition.clone(),

apollo-federation/src/operation/mod.rs

@@ -2811,6 +2811,7 @@ impl TryFrom<&Operation> for executable::Operation {
     fn try_from(normalized_operation: &Operation) -> Result<Self, Self::Error> {
         let operation_type: executable::OperationType = normalized_operation.root_kind.into();
         Ok(Self {
+            description: None,
             operation_type,
             name: normalized_operation.name.clone(),
             variables: normalized_operation.variables.deref().clone(),

apollo-federation/src/operation/optimize.rs

@@ -137,6 +137,7 @@ impl Operation {
 
         let operation_type: executable::OperationType = self.root_kind.into();
         let operation = executable::Operation {
+            description: None,
             operation_type,
             name: self.name.clone(),
             variables: self.variables.deref().clone(),
@@ -409,6 +410,7 @@ impl<'a> FragmentGenerator<'a> {
         // minify current selection set and extract named fragment
         let minified_selection_set = self.minify(selection_set)?;
         let new_fragment = Fragment {
+            description: None,
             name: self.next_name(),
             selection_set: minified_selection_set,
             directives: Default::default(),

apollo-federation/src/query_plan/fetch_dependency_graph.rs

@@ -2906,6 +2906,7 @@ impl FetchDependencyGraphNode {
         let context_variable_definitions = self.inputs.iter().flat_map(|inputs| {
             inputs.used_contexts.iter().map(|(context, ty)| {
                 Node::new(VariableDefinition {
+                    description: None,
                     name: context.clone(),
                     ty: ty.clone(),
                     default_value: None,
@@ -3452,6 +3453,7 @@ fn representations_variable_definition(
     let any_name = schema.federation_type_name_in_schema(ANY_SCALAR_NAME)?;
 
     Ok(VariableDefinition {
+        description: None,
         name: FEDERATION_REPRESENTATIONS_VAR_NAME,
         ty: Type::Named(any_name).non_null().list().non_null().into(),
         default_value: None,

apollo-router/src/plugins/mock_subgraphs/mod.rs

@@ -7,7 +7,7 @@ use apollo_compiler::ExecutableDocument;
 use apollo_compiler::Schema;
 use apollo_compiler::ast::OperationType;
 use apollo_compiler::resolvers::Execution;
-use apollo_compiler::resolvers::FieldError;
+use apollo_compiler::resolvers::ExecutionError;
 use apollo_compiler::resolvers::ObjectValue;
 use apollo_compiler::resolvers::ResolveInfo;
 use apollo_compiler::resolvers::ResolvedValue;
@@ -297,7 +297,7 @@ impl ObjectValue for RootResolver<'_> {
     fn resolve_field<'a>(
         &'a self,
         info: &'a ResolveInfo<'a>,
-    ) -> Result<ResolvedValue<'a>, FieldError> {
+    ) -> Result<ResolvedValue<'a>, ExecutionError> {
         if info.field_name() != "_entities" {
             let in_entity = false;
             return resolve_normal_field(
@@ -309,17 +309,17 @@ impl ObjectValue for RootResolver<'_> {
         }
         let entities = info.arguments()["representations"]
             .as_array()
-            .ok_or(FieldError {
+            .ok_or(ExecutionError {
                 message: "expected array `representations`".into(),
             })?
             .iter()
             .map(move |representation| {
-                let representation = representation.as_object().ok_or(FieldError {
+                let representation = representation.as_object().ok_or(ExecutionError {
                     message: "expected object `representations[n]`".into(),
                 })?;
                 let entity = self
                     .find_entities(representation)
-                    .ok_or_else(|| FieldError {
+                    .ok_or_else(|| ExecutionError {
                         message: format!(
                             "no mocked entity found for representation {representation:?}"
                         ),
@@ -353,7 +353,7 @@ impl ObjectValue for MockResolver<'_> {
     fn resolve_field<'a>(
         &'a self,
         info: &'a ResolveInfo<'a>,
-    ) -> Result<ResolvedValue<'a>, FieldError> {
+    ) -> Result<ResolvedValue<'a>, ExecutionError> {
         resolve_normal_field(self.response_extensions, self.in_entity, self.mocks, info)
     }
 }
@@ -371,10 +371,10 @@ fn resolve_normal_field<'a>(
     in_entity: bool,
     mocks: &'a JsonMap,
     info: &'a ResolveInfo<'a>,
-) -> Result<ResolvedValue<'a>, FieldError> {
+) -> Result<ResolvedValue<'a>, ExecutionError> {
     // TODO: find some way to vary response based on arguments?
     let field_name = info.field_name();
-    let mock = mocks.get(field_name).ok_or_else(|| FieldError {
+    let mock = mocks.get(field_name).ok_or_else(|| ExecutionError {
         message: format!("field '{field_name}' not found in mocked data"),
     })?;
     resolve_value(response_extensions, in_entity, mock, info)
@@ -385,7 +385,7 @@ fn resolve_value<'a>(
     in_entity: bool,
     mock: &'a JsonValue,
     info: &'a ResolveInfo<'a>,
-) -> Result<ResolvedValue<'a>, FieldError> {
+) -> Result<ResolvedValue<'a>, ExecutionError> {
     match mock {
         JsonValue::Object(map) => {
             if !in_entity && let Some(keys) = map.get("__cacheTags") {

apollo-router/src/plugins/response_cache/plugin.rs

@@ -1806,7 +1806,7 @@ fn get_invalidation_root_keys_from_schema(
         fn resolve_field<'a>(
             &'a self,
             info: &'a resolvers::ResolveInfo<'a>,
-        ) -> Result<resolvers::ResolvedValue<'a>, resolvers::FieldError> {
+        ) -> Result<resolvers::ResolvedValue<'a>, resolvers::ExecutionError> {
             let mut result = self.result.borrow_mut();
             let Ok(keys) = &mut *result else {
                 return Ok(resolvers::ResolvedValue::SkipForPartialExecution);

apollo-router/src/query_planner/subgraph_context.rs

@@ -245,6 +245,7 @@ fn transform_operation(
         if arguments.contains(v.name.as_str()) {
             for i in 0..*count {
                 new_variables.push(Node::new(VariableDefinition {
+                    description: None,
                     name: Name::new_unchecked(&format!("{}_{}", v.name.as_str(), i)),
                     ty: v.ty.clone(),
                     default_value: v.default_value.clone(),
@@ -440,6 +441,7 @@ mod subgraph_context_unit_tests {
         // add_alias = true will add a "_3:" alias
         let clone = selection_set.clone();
         let mut operation = Node::new(executable::Operation {
+            description: None,
             operation_type: executable::OperationType::Query,
             name: None,
             variables: vec![],