graphql_client_codegen: update to graphql_parser 0.3

Requires 0.3.1 so that `Document<'a, String>::into_static()` exists.

Future work can try and reduce the amount of `'static` used throughout
the API, but this at least gets 0.3 into a working state.

Author: mathstuf

graphql_client_codegen/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 graphql-introspection-query = { version = "0.2.0", path = "../graphql-introspection-query" }
-graphql-parser = "0.3"
+graphql-parser = "0.3.1"
 heck = "0.3"
 lazy_static = "1.3"
 proc-macro2 = { version = "^1.0", features = [] }

graphql_client_codegen/src/codegen.rs

@@ -237,7 +237,7 @@ fn generate_fragment_definitions<'a>(
 
 /// For default value constructors.
 fn graphql_parser_value_to_literal(
-    value: &graphql_parser::query::Value,
+    value: &graphql_parser::query::Value<'static, String>,
     ty: TypeId,
     is_optional: bool,
     query: &BoundQuery<'_>,
@@ -290,7 +290,7 @@ fn graphql_parser_value_to_literal(
 
 /// For default value constructors.
 fn render_object_literal(
-    object_map: &BTreeMap<String, graphql_parser::query::Value>,
+    object_map: &BTreeMap<String, graphql_parser::query::Value<'static, String>>,
     input_id: InputId,
     query: &BoundQuery<'_>,
 ) -> TokenStream {

graphql_client_codegen/src/lib.rs

@@ -47,7 +47,7 @@ type CacheMap<T> = std::sync::Mutex<HashMap<std::path::PathBuf, T>>;
 
 lazy_static! {
     static ref SCHEMA_CACHE: CacheMap<schema::Schema> = CacheMap::default();
-    static ref QUERY_CACHE: CacheMap<(String, graphql_parser::query::Document)> =
+    static ref QUERY_CACHE: CacheMap<(String, graphql_parser::query::Document<'static, String>)> =
         CacheMap::default();
 }
 
@@ -74,7 +74,7 @@ pub fn generate_module_token_stream(
                 schema_string = read_file(v.key())?;
                 let schema = match schema_extension {
                     "graphql" | "gql" => {
-                        let s = graphql_parser::schema::parse_schema(&schema_string).map_err(|parser_error| GeneralError(format!("Parser error: {}", parser_error)))?;
+                        let s = graphql_parser::schema::parse_schema::<&str>(&schema_string).map_err(|parser_error| GeneralError(format!("Parser error: {}", parser_error)))?;
                         schema::Schema::from(s)
                     }
                     "json" => {
@@ -97,7 +97,8 @@ pub fn generate_module_token_stream(
             hash_map::Entry::Vacant(v) => {
                 let query_string = read_file(v.key())?;
                 let query = graphql_parser::parse_query(&query_string)
-                    .map_err(|err| GeneralError(format!("Query parser error: {}", err)))?;
+                    .map_err(|err| GeneralError(format!("Query parser error: {}", err)))?
+                    .into_static();
                 v.insert((query_string, query)).clone()
             }
         }

graphql_client_codegen/src/query.rs

@@ -61,7 +61,7 @@ pub(crate) struct VariableId(u32);
 
 pub(crate) fn resolve(
     schema: &Schema,
-    query: &graphql_parser::query::Document,
+    query: &graphql_parser::query::Document<'static, String>,
 ) -> Result<Query, QueryValidationError> {
     let mut resolved_query: Query = Default::default();
 
@@ -100,7 +100,7 @@ pub(crate) fn resolve(
 
 fn create_roots(
     resolved_query: &mut Query,
-    query: &graphql_parser::query::Document,
+    query: &graphql_parser::query::Document<'static, String>,
     schema: &Schema,
 ) -> Result<(), QueryValidationError> {
     // First, give ids to all fragments and operations.
@@ -194,7 +194,7 @@ fn create_roots(
 fn resolve_fragment(
     query: &mut Query,
     schema: &Schema,
-    fragment_definition: &graphql_parser::query::FragmentDefinition,
+    fragment_definition: &graphql_parser::query::FragmentDefinition<'static, String>,
 ) -> Result<(), QueryValidationError> {
     let graphql_parser::query::TypeCondition::On(on) = &fragment_definition.type_condition;
     let on = schema.find_type(on).ok_or_else(|| {
@@ -227,7 +227,7 @@ fn resolve_fragment(
 fn resolve_union_selection(
     query: &mut Query,
     _union_id: UnionId,
-    selection_set: &graphql_parser::query::SelectionSet,
+    selection_set: &graphql_parser::query::SelectionSet<'static, String>,
     parent: SelectionParent,
     schema: &Schema,
 ) -> Result<(), QueryValidationError> {
@@ -271,7 +271,7 @@ fn resolve_union_selection(
 fn resolve_object_selection<'a>(
     query: &mut Query,
     object: &dyn crate::schema::ObjectLike,
-    selection_set: &graphql_parser::query::SelectionSet,
+    selection_set: &graphql_parser::query::SelectionSet<'static, String>,
     parent: SelectionParent,
     schema: &'a Schema,
 ) -> Result<(), QueryValidationError> {
@@ -341,7 +341,7 @@ fn resolve_object_selection<'a>(
 fn resolve_selection(
     ctx: &mut Query,
     on: TypeId,
-    selection_set: &graphql_parser::query::SelectionSet,
+    selection_set: &graphql_parser::query::SelectionSet<'static, String>,
     parent: SelectionParent,
     schema: &Schema,
 ) -> Result<(), QueryValidationError> {
@@ -373,7 +373,7 @@ fn resolve_selection(
 fn resolve_inline_fragment(
     query: &mut Query,
     schema: &Schema,
-    inline_fragment: &graphql_parser::query::InlineFragment,
+    inline_fragment: &graphql_parser::query::InlineFragment<'static, String>,
     parent: SelectionParent,
 ) -> Result<SelectionId, QueryValidationError> {
     let graphql_parser::query::TypeCondition::On(on) = inline_fragment
@@ -409,7 +409,7 @@ fn resolve_inline_fragment(
 fn resolve_operation(
     query: &mut Query,
     schema: &Schema,
-    operation: &graphql_parser::query::OperationDefinition,
+    operation: &graphql_parser::query::OperationDefinition<'static, String>,
 ) -> Result<(), QueryValidationError> {
     match operation {
         graphql_parser::query::OperationDefinition::Mutation(m) => {
@@ -554,7 +554,7 @@ impl Query {
 pub(crate) struct ResolvedVariable {
     pub(crate) operation_id: OperationId,
     pub(crate) name: String,
-    pub(crate) default: Option<graphql_parser::query::Value>,
+    pub(crate) default: Option<graphql_parser::query::Value<'static, String>>,
     pub(crate) r#type: StoredFieldType,
 }
 
@@ -624,7 +624,7 @@ impl UsedTypes {
 
 fn resolve_variables(
     query: &mut Query,
-    variables: &[graphql_parser::query::VariableDefinition],
+    variables: &[graphql_parser::query::VariableDefinition<'static, String>],
     schema: &Schema,
     operation_id: OperationId,
 ) {

graphql_client_codegen/src/schema.rs

@@ -443,8 +443,12 @@ pub(crate) fn input_is_recursive_without_indirection(input_id: InputId, schema:
     let mut visited_types = HashSet::<&str>::new();
     input.contains_type_without_indirection(input_id, schema, &mut visited_types)
 }
-impl std::convert::From<graphql_parser::schema::Document> for Schema {
-    fn from(ast: graphql_parser::schema::Document) -> Schema {
+impl<'doc, T> std::convert::From<graphql_parser::schema::Document<'doc, T>> for Schema
+where
+    T: graphql_parser::query::Text<'doc>,
+    T::Value: AsRef<str>,
+{
+    fn from(ast: graphql_parser::schema::Document<'doc, T>) -> Schema {
         graphql_parser_conversion::build_schema(ast)
     }
 }
@@ -459,10 +463,13 @@ impl std::convert::From<graphql_introspection_query::introspection_response::Int
     }
 }
 
-pub(crate) fn resolve_field_type(
+pub(crate) fn resolve_field_type<'doc, T>(
     schema: &Schema,
-    inner: &graphql_parser::schema::Type,
-) -> StoredFieldType {
+    inner: &graphql_parser::schema::Type<'doc, T>,
+) -> StoredFieldType
+where
+    T: graphql_parser::query::Text<'doc>,
+{
     use crate::type_qualifiers::graphql_parser_depth;
     use graphql_parser::schema::Type::*;
 
@@ -483,7 +490,7 @@ pub(crate) fn resolve_field_type(
             }
             NamedType(name) => {
                 return StoredFieldType {
-                    id: schema.find_type_id(name),
+                    id: schema.find_type_id(name.as_ref()),
                     qualifiers,
                 }
             }