WIP: Fix Lifetime Issues For Support Serde Deserialization

Author: anshap1719

src/common.rs

@@ -4,16 +4,19 @@ use combine::easy::{Error, Info};
 use combine::{choice, many, many1, optional, position, StdParseResult};
 use combine::{parser, Parser};
 #[cfg(feature = "serde")]
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 use crate::helpers::{ident, kind, name, punct};
 use crate::position::Pos;
 use crate::tokenizer::{Kind as T, Token, TokenStream};
 
+#[cfg(feature = "serde")]
 /// Text abstracts over types that hold a string value.
 /// It is used to make the AST generic over the string type.
-pub trait Text<'a>: 'a {
-    #[cfg(feature = "serde")]
+pub trait Text<'a>
+where
+    Self: 'a + Serialize + Deserialize<'a>,
+{
     type Value: 'a
         + From<&'a str>
         + AsRef<str>
@@ -24,9 +27,14 @@ pub trait Text<'a>: 'a {
         + Ord
         + fmt::Debug
         + Clone
-        + Serialize;
+        + Serialize
+        + Deserialize<'a>;
+}
 
-    #[cfg(not(feature = "serde"))]
+#[cfg(not(feature = "serde"))]
+/// Text abstracts over types that hold a string value.
+/// It is used to make the AST generic over the string type.
+pub trait Text<'a>: 'a {
     type Value: 'a
         + From<&'a str>
         + AsRef<str>
@@ -52,7 +60,7 @@ impl<'a> Text<'a> for std::borrow::Cow<'a, str> {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Directive<'a, T: Text<'a>> {
     pub position: Pos,
     pub name: T::Value,
@@ -66,13 +74,13 @@ pub struct Directive<'a, T: Text<'a>> {
 /// in `serde_json`: encapsulate value in new-type, allowing type
 /// to be extended later.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 // we use i64 as a reference implementation: graphql-js thinks even 32bit
 // integers is enough. We might consider lift this limit later though
 pub struct Number(pub(crate) i64);
 
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Value<'a, T: Text<'a>> {
     Variable(T::Value),
     Int(Number),
@@ -106,7 +114,7 @@ impl<'a, T: Text<'a>> Value<'a, T> {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Type<'a, T: Text<'a>> {
     NamedType(T::Value),
     ListType(Box<Type<'a, T>>),

src/position.rs

@@ -1,10 +1,10 @@
 #[cfg(feature = "serde")]
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use std::fmt;
 
 /// Original position of element in source code
 #[derive(PartialOrd, Ord, PartialEq, Eq, Clone, Copy, Default, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Pos {
     /// One-based line number
     pub line: usize,

src/schema/ast.rs

@@ -1,6 +1,6 @@
-use std::str::FromStr;
 #[cfg(feature = "serde")]
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
+use std::str::FromStr;
 use thiserror::Error;
 
 pub use crate::common::{Directive, Text, Type, Value};

src/schema/format.rs

@@ -1,9 +1,7 @@
-use std::fmt;
-
 use crate::common::Text;
 use crate::format::{format_directives, Displayable, Formatter, Style};
-
 use crate::schema::ast::*;
+use std::fmt;
 
 impl<'a, T> Document<'a, T>
 where