all: Bump graphql-tools from 0.4.0 to 0.5.0

dependabot[bot] · lutter · commit e56be4e0aa0d · 2026-01-27T13:05:19.000-08:00
This also switches us from the standalone graphql-parser to the parser bundled with graphql-tools. Bumps [graphql-tools](https://github.com/graphql-hive/router) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/graphql-hive/router/releases) - [Changelog](https://github.com/graphql-hive/router/blob/main/RELEASE.md) - [Commits](https://github.com/graphql-hive/router/commits/graphql-tools/v0.5.0) --- updated-dependencies: - dependency-name: graphql-tools dependency-version: 0.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -66,6 +66,7 @@ graph-store-postgres = { path = "./store/postgres" }
 graphman-server = { path = "./server/graphman" }
 graphman = { path = "./core/graphman" }
 graphman-store = { path = "./core/graphman_store" }
+graphql-tools = "0.5.0"
 itertools = "0.14.0"
 lazy_static = "1.5.0"
 prost = "0.13"
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
@@ -37,7 +37,7 @@ http-body-util = "0.1"
 hyper-util = { version = "0.1", features = ["full"] }
 futures01 = { package = "futures", version = "0.1.31" }
 lru_time_cache = "0.11"
-graphql-parser = "0.4.1"
+graphql-tools = { workspace = true }
 lazy_static = "1.5.0"
 num-bigint = { version = "=0.2.6", features = ["serde"] }
 num-integer = { version = "=0.1.46" }
diff --git a/graph/examples/validate.rs b/graph/examples/validate.rs
@@ -36,7 +36,7 @@ use graph::data::subgraph::SPEC_VERSION_1_1_0;
 use graph::prelude::s;
 use graph::prelude::DeploymentHash;
 use graph::schema::InputSchema;
-use graphql_parser::parse_schema;
+use graphql_tools::parser::parse_schema;
 use serde::Deserialize;
 use std::alloc::GlobalAlloc;
 use std::alloc::Layout;
@@ -147,7 +147,7 @@ struct Opts {
     #[clap(long)]
     api: bool,
     #[clap(
-        short, long, default_value = "validate", 
+        short, long, default_value = "validate",
         value_parser = clap::builder::PossibleValuesParser::new(&["validate", "size"])
     )]
     mode: RunMode,
diff --git a/graph/src/data/graphql/ext.rs b/graph/src/data/graphql/ext.rs
@@ -394,7 +394,7 @@ impl FieldExt for Field {
 
 #[cfg(test)]
 mod directive_finder_tests {
-    use graphql_parser::parse_schema;
+    use graphql_tools::parser::parse_schema;
 
     use super::*;
 
diff --git a/graph/src/data/graphql/shape_hash.rs b/graph/src/data/graphql/shape_hash.rs
@@ -38,7 +38,7 @@ impl ShapeHash for q::Document {
 
 impl ShapeHash for q::OperationDefinition {
     fn shape_hash(&self, hasher: &mut ShapeHasher) {
-        use graphql_parser::query::OperationDefinition::*;
+        use graphql_tools::parser::query::OperationDefinition::*;
         // We want `[query|subscription|mutation] things { BODY }` to hash
         // to the same thing as just `things { BODY }`
         match self {
@@ -69,7 +69,7 @@ impl ShapeHash for q::SelectionSet {
 
 impl ShapeHash for q::Selection {
     fn shape_hash(&self, hasher: &mut ShapeHasher) {
-        use graphql_parser::query::Selection::*;
+        use graphql_tools::parser::query::Selection::*;
         match self {
             Field(field) => field.shape_hash(hasher),
             FragmentSpread(spread) => spread.shape_hash(hasher),
@@ -92,7 +92,7 @@ impl ShapeHash for q::Field {
 
 impl ShapeHash for s::Value {
     fn shape_hash(&self, hasher: &mut ShapeHasher) {
-        use graphql_parser::schema::Value::*;
+        use graphql_tools::parser::schema::Value::*;
 
         match self {
             Variable(_) | Int(_) | Float(_) | String(_) | Boolean(_) | Null | Enum(_) => {
@@ -151,7 +151,7 @@ impl ShapeHash for q::TypeCondition {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use graphql_parser::parse_query;
+    use graphql_tools::parser::parse_query;
 
     #[test]
     fn identical_and_different() {
diff --git a/graph/src/data/query/error.rs b/graph/src/data/query/error.rs
@@ -1,4 +1,4 @@
-use graphql_parser::Pos;
+use graphql_tools::parser::Pos;
 use hex::FromHexError;
 use serde::ser::*;
 use std::collections::HashMap;
diff --git a/graph/src/data/query/query.rs b/graph/src/data/query/query.rs
@@ -147,7 +147,7 @@ impl Query {
         {
             (
                 document
-                    .format(graphql_parser::Style::default().indent(0))
+                    .format(graphql_tools::parser::Style::default().indent(0))
                     .replace('\n', " "),
                 serde_json::to_string(&variables).unwrap_or_default(),
             )
diff --git a/graph/src/data/store/mod.rs b/graph/src/data/store/mod.rs
@@ -329,7 +329,7 @@ impl NullValue for Value {
 
 impl Value {
     pub fn from_query_value(value: &r::Value, ty: &s::Type) -> Result<Value, QueryExecutionError> {
-        use graphql_parser::schema::Type::{ListType, NamedType, NonNullType};
+        use graphql_tools::parser::schema::Type::{ListType, NamedType, NonNullType};
 
         Ok(match (value, ty) {
             // When dealing with non-null types, use the inner type to convert the value
diff --git a/graph/src/lib.rs b/graph/src/lib.rs
@@ -177,8 +177,8 @@ pub mod prelude {
     macro_rules! static_graphql {
         ($m:ident, $m2:ident, {$($n:ident,)*}) => {
             pub mod $m {
-                use graphql_parser::$m2 as $m;
-                pub use graphql_parser::Pos;
+                use graphql_tools::parser::$m2 as $m;
+                pub use graphql_tools::parser::Pos;
                 pub use $m::*;
                 $(
                     pub type $n = $m::$n<'static, String>;
diff --git a/graph/src/schema/api.rs b/graph/src/schema/api.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::Context;
-use graphql_parser::Pos;
+use graphql_tools::parser::Pos;
 use lazy_static::lazy_static;
 use thiserror::Error;
 
@@ -1288,7 +1288,7 @@ mod tests {
         prelude::{s, DeploymentHash},
         schema::{InputSchema, SCHEMA_TYPE_NAME},
     };
-    use graphql_parser::schema::*;
+    use graphql_tools::parser::schema::*;
     use lazy_static::lazy_static;
 
     use super::ApiSchema;
diff --git a/graph/src/schema/ast.rs b/graph/src/schema/ast.rs
@@ -1,4 +1,4 @@
-use graphql_parser::Pos;
+use graphql_tools::parser::Pos;
 use lazy_static::lazy_static;
 use std::ops::Deref;
 use std::str::FromStr;
@@ -161,7 +161,7 @@ pub fn get_object_type_mut<'a>(
     schema: &'a mut s::Document,
     name: &str,
 ) -> Option<&'a mut s::ObjectType> {
-    use graphql_parser::schema::TypeDefinition::*;
+    use graphql_tools::parser::schema::TypeDefinition::*;
 
     get_named_type_definition_mut(schema, name).and_then(|type_def| match type_def {
         Object(object_type) => Some(object_type),
@@ -174,7 +174,7 @@ pub fn get_interface_type_mut<'a>(
     schema: &'a mut s::Document,
     name: &str,
 ) -> Option<&'a mut s::InterfaceType> {
-    use graphql_parser::schema::TypeDefinition::*;
+    use graphql_tools::parser::schema::TypeDefinition::*;
 
     get_named_type_definition_mut(schema, name).and_then(|type_def| match type_def {
         Interface(interface_type) => Some(interface_type),
diff --git a/graph/src/schema/input/mod.rs b/graph/src/schema/input/mod.rs
@@ -2827,7 +2827,7 @@ type Account implements Address @entity { id: ID!, txn: Transaction! @derivedFro
             fn validate(field: &str, errmsg: &str) {
                 let raw = format!("type A @entity {{ id: ID!\n {} }}\n{}", field, OTHER_TYPES);
 
-                let document = graphql_parser::parse_schema(&raw)
+                let document = graphql_tools::parser::parse_schema(&raw)
                     .expect("Failed to parse raw schema")
                     .into_static();
                 let schema = BaseSchema::new(DeploymentHash::new("id").unwrap(), document).unwrap();
@@ -2884,8 +2884,8 @@ type Account implements Address @entity { id: ID!, txn: Transaction! @derivedFro
             const ROOT_SCHEMA: &str = "
 type _Schema_ { id: ID! }";
 
-            let document =
-                graphql_parser::parse_schema(ROOT_SCHEMA).expect("Failed to parse root schema");
+            let document = graphql_tools::parser::parse_schema(ROOT_SCHEMA)
+                .expect("Failed to parse root schema");
             let schema = BaseSchema::new(DeploymentHash::new("id").unwrap(), document).unwrap();
             let schema = Schema::new(LATEST_VERSION, &schema);
             assert_eq!(
@@ -2901,8 +2901,8 @@ type _Schema_ { id: ID! }";
             const ROOT_SCHEMA: &str = "
 type _Schema_ @illegal";
 
-            let document =
-                graphql_parser::parse_schema(ROOT_SCHEMA).expect("Failed to parse root schema");
+            let document = graphql_tools::parser::parse_schema(ROOT_SCHEMA)
+                .expect("Failed to parse root schema");
             let schema = BaseSchema::new(DeploymentHash::new("id").unwrap(), document).unwrap();
             let schema = Schema::new(LATEST_VERSION, &schema);
             assert_eq!(
@@ -2926,8 +2926,8 @@ type A @entity {
   color: Color
 }"#;
 
-            let document =
-                graphql_parser::parse_schema(ROOT_SCHEMA).expect("Failed to parse root schema");
+            let document = graphql_tools::parser::parse_schema(ROOT_SCHEMA)
+                .expect("Failed to parse root schema");
             let schema = BaseSchema::new(DeploymentHash::new("id").unwrap(), document).unwrap();
             let schema = Schema::new(LATEST_VERSION, &schema);
             assert_eq!(schema.validate_fields().len(), 0);
@@ -3035,7 +3035,8 @@ type Gravatar @entity {
   imageUrl: String!
 }"#;
 
-            let document = graphql_parser::parse_schema(SCHEMA).expect("Failed to parse schema");
+            let document =
+                graphql_tools::parser::parse_schema(SCHEMA).expect("Failed to parse schema");
             let schema = BaseSchema::new(DeploymentHash::new("id1").unwrap(), document).unwrap();
             let schema = Schema::new(LATEST_VERSION, &schema);
             assert_eq!(schema.validate_fulltext_directives(), vec![]);
diff --git a/graph/src/schema/mod.rs b/graph/src/schema/mod.rs
@@ -3,7 +3,7 @@ use crate::data::subgraph::DeploymentHash;
 use crate::prelude::{anyhow, s};
 
 use anyhow::Error;
-use graphql_parser::{self, Pos};
+use graphql_tools::parser::Pos;
 use semver::Version;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
@@ -280,7 +280,7 @@ impl Schema {
     }
 
     pub fn parse(raw: &str, id: DeploymentHash) -> Result<Self, Error> {
-        let document = graphql_parser::parse_schema(raw)?.into_static();
+        let document = graphql_tools::parser::parse_schema(raw)?.into_static();
 
         Schema::new(id, document).map_err(Into::into)
     }
diff --git a/graphql/Cargo.toml b/graphql/Cargo.toml
@@ -7,7 +7,7 @@ edition.workspace = true
 async-trait = { workspace = true }
 crossbeam = "0.8"
 graph = { path = "../graph" }
-graphql-tools = "0.4.0"
+graphql-tools = { workspace = true }
 lazy_static = "1.5.0"
 stable-hash = { git = "https://github.com/graphprotocol/stable-hash", branch = "main"}
 stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", branch = "old", package = "stable-hash" }
diff --git a/store/postgres/Cargo.toml b/store/postgres/Cargo.toml
@@ -41,7 +41,7 @@ serde_yaml.workspace = true
 
 [dev-dependencies]
 clap.workspace = true
-graphql-parser = "0.4.1"
+graphql-tools = { workspace = true }
 
 [lints]
 workspace = true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use graphql_parser::Pos;`
	`1`	`+use graphql_tools::parser::Pos;`
`2`	`2`	`use hex::FromHexError;`
`3`	`3`	`use serde::ser::*;`
`4`	`4`	`use std::collections::HashMap;`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ impl Query {`
`147`	`147`	`{`
`148`	`148`	`(`
`149`	`149`	`document`
`150`		`- .format(graphql_parser::Style::default().indent(0))`
	`150`	`+ .format(graphql_tools::parser::Style::default().indent(0))`
`151`	`151`	`.replace('\n', " "),`
`152`	`152`	`serde_json::to_string(&variables).unwrap_or_default(),`
`153`	`153`	`)`