graph, store: Prefer using the q and s module over graphql_tools::parser

Author: lutter

Cargo.lock

@@ -36,7 +36,6 @@ use graph::data::subgraph::SPEC_VERSION_1_1_0;
 use graph::prelude::s;
 use graph::prelude::DeploymentHash;
 use graph::schema::InputSchema;
-use graphql_tools::parser::parse_schema;
 use serde::Deserialize;
 use std::alloc::GlobalAlloc;
 use std::alloc::Layout;
@@ -157,7 +156,7 @@ struct Opts {
 }
 
 fn parse(raw: &str, name: &str, api: bool) -> Result<DeploymentHash> {
-    let schema = parse_schema(raw)
+    let schema = s::parse_schema(raw)
         .map(|v| v.into_static())
         .map_err(|e| anyhow!("Failed to parse schema sgd{name}: {e}"))?;
     let id = subgraph_id(&schema);
@@ -233,7 +232,7 @@ impl Sizer {
         let elapsed = start.elapsed();
         let txt_size = raw.len();
         let (gql_size, _) = self.size(|| {
-            parse_schema(raw)
+            s::parse_schema(raw)
                 .map(|v| v.into_static())
                 .map_err(Into::into)
         })?;

graph/examples/validate.rs

@@ -394,8 +394,6 @@ impl FieldExt for Field {
 
 #[cfg(test)]
 mod directive_finder_tests {
-    use graphql_tools::parser::parse_schema;
-
     use super::*;
 
     const SCHEMA: &str = "
@@ -407,7 +405,7 @@ mod directive_finder_tests {
     /// Makes sure that the DirectiveFinder::find_directive implementation for ObjectiveType and Field works
     #[test]
     fn find_directive_impls() {
-        let ast = parse_schema::<String>(SCHEMA).unwrap();
+        let ast = s::parse_schema::<String>(SCHEMA).unwrap();
         let object_types = ast.get_object_type_definitions();
         assert_eq!(object_types.len(), 1);
         let object_type = object_types[0];
@@ -430,7 +428,7 @@ mod directive_finder_tests {
     /// Makes sure that the DirectiveFinder::is_derived implementation for ObjectiveType and Field works
     #[test]
     fn is_derived_impls() {
-        let ast = parse_schema::<String>(SCHEMA).unwrap();
+        let ast = s::parse_schema::<String>(SCHEMA).unwrap();
         let object_types = ast.get_object_type_definitions();
         assert_eq!(object_types.len(), 1);
         let object_type = object_types[0];

graph/src/data/graphql/ext.rs

@@ -151,24 +151,23 @@ impl ShapeHash for q::TypeCondition {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use graphql_tools::parser::parse_query;
 
     #[test]
     fn identical_and_different() {
         const Q1: &str = "query things($stuff: Int) { things(where: { stuff_gt: $stuff }) { id } }";
         const Q2: &str = "{ things(where: { stuff_gt: 42 }) { id } }";
         const Q3: &str = "{ things(where: { stuff_lte: 42 }) { id } }";
         const Q4: &str = "{ things(where: { stuff_gt: 42 }) { id name } }";
-        let q1 = parse_query(Q1)
+        let q1 = q::parse_query(Q1)
             .expect("q1 is syntactically valid")
             .into_static();
-        let q2 = parse_query(Q2)
+        let q2 = q::parse_query(Q2)
             .expect("q2 is syntactically valid")
             .into_static();
-        let q3 = parse_query(Q3)
+        let q3 = q::parse_query(Q3)
             .expect("q3 is syntactically valid")
             .into_static();
-        let q4 = parse_query(Q4)
+        let q4 = q::parse_query(Q4)
             .expect("q4 is syntactically valid")
             .into_static();
 

graph/src/data/graphql/shape_hash.rs

@@ -1,4 +1,3 @@
-use graphql_tools::parser::Pos;
 use hex::FromHexError;
 use serde::ser::*;
 use std::collections::HashMap;
@@ -26,20 +25,20 @@ pub enum QueryExecutionError {
     OperationNameRequired,
     OperationNotFound(String),
     NotSupported(String),
-    NonNullError(Pos, String),
-    ListValueError(Pos, String),
+    NonNullError(q::Pos, String),
+    ListValueError(q::Pos, String),
     NamedTypeError(String),
     AbstractTypeError(String),
-    InvalidArgumentError(Pos, String, q::Value),
-    MissingArgumentError(Pos, String),
-    ValidationError(Option<Pos>, String),
-    InvalidVariableTypeError(Pos, String),
-    MissingVariableError(Pos, String),
+    InvalidArgumentError(q::Pos, String, q::Value),
+    MissingArgumentError(q::Pos, String),
+    ValidationError(Option<q::Pos>, String),
+    InvalidVariableTypeError(q::Pos, String),
+    MissingVariableError(q::Pos, String),
     ResolveEntitiesError(String),
     OrderByNotSupportedError(String, String),
     OrderByNotSupportedForType(String),
     FilterNotSupportedError(String, String),
-    UnknownField(Pos, String, String),
+    UnknownField(q::Pos, String, String),
     EmptyQuery,
     InvalidOrFilterStructure(Vec<String>, String),
     SubgraphDeploymentIdError(String),
@@ -55,10 +54,10 @@ pub enum QueryExecutionError {
     StoreError(CloneableAnyhowError),
     Timeout,
     EmptySelectionSet(String),
-    AmbiguousDerivedFromResult(Pos, String, String, String),
+    AmbiguousDerivedFromResult(q::Pos, String, String, String),
     Unimplemented(String),
-    EnumCoercionError(Pos, String, q::Value, String, Vec<String>),
-    ScalarCoercionError(Pos, String, q::Value, String),
+    EnumCoercionError(q::Pos, String, q::Value, String, Vec<String>),
+    ScalarCoercionError(q::Pos, String, q::Value, String),
     TooComplex(u64, u64), // (complexity, max_complexity)
     TooDeep(u8),          // max_depth
     CyclicalFragment(String),

graph/src/data/query/error.rs

@@ -176,31 +176,34 @@ pub mod prelude {
 
     macro_rules! static_graphql {
         ($m:ident, $m2:ident, {$($n:ident,)*}) => {
-            pub mod $m {
                 use graphql_tools::parser::$m2 as $m;
                 pub use graphql_tools::parser::Pos;
                 pub use $m::*;
                 $(
                     pub type $n = $m::$n<'static, String>;
                 )*
-            }
         };
     }
 
     // Static graphql mods. These are to be phased out, with a preference
     // toward making graphql generic over text. This helps to ease the
     // transition by providing the old graphql-parse 0.2.x API
-    static_graphql!(q, query, {
-        Document, Value, OperationDefinition, InlineFragment, TypeCondition,
-        FragmentSpread, Field, Selection, SelectionSet, FragmentDefinition,
-        Directive, VariableDefinition, Type, Query,
-    });
-    static_graphql!(s, schema, {
-        Field, Directive, InterfaceType, ObjectType, Value, TypeDefinition,
-        EnumType, Type, Definition, Document, ScalarType, InputValue, DirectiveDefinition,
-        UnionType, InputObjectType, EnumValue,
-    });
-
+    pub mod q {
+        static_graphql!(q, query, {
+            Document, Value, OperationDefinition, InlineFragment, TypeCondition,
+            FragmentSpread, Field, Selection, SelectionSet, FragmentDefinition,
+            Directive, VariableDefinition, Type, Query,
+        });
+        pub use q::parse_query;
+    }
+    pub mod s {
+        static_graphql!(s, schema, {
+            Field, Directive, InterfaceType, ObjectType, Value, TypeDefinition,
+            EnumType, Type, Definition, Document, ScalarType, InputValue, DirectiveDefinition,
+            UnionType, InputObjectType, EnumValue,
+        });
+        pub use s::parse_schema;
+    }
     pub mod r {
         pub use crate::data::value::{Object, Value};
     }