Add Serde Support For AST

Author: anshap1719

.gitignore

@@ -1,3 +1,4 @@
 /Cargo.lock
 /.vagga
 /target
+/.idea

Cargo.toml

@@ -14,9 +14,6 @@ version = "0.4.0"
 authors = ["Paul Colomiets <[email protected]>"]
 edition = "2018"
 
-[features]
-serde = ["dep:serde"]
-
 [dependencies]
 combine = "4.6.6"
 serde = { version = "1.0.163", features = ["derive"], optional = true }

src/common.rs

@@ -3,6 +3,8 @@ use std::{collections::BTreeMap, fmt};
 use combine::easy::{Error, Info};
 use combine::{choice, many, many1, optional, position, StdParseResult};
 use combine::{parser, Parser};
+#[cfg(feature = "serde")]
+use serde::Serialize;
 
 use crate::helpers::{ident, kind, name, punct};
 use crate::position::Pos;
@@ -11,6 +13,20 @@ use crate::tokenizer::{Kind as T, Token, TokenStream};
 /// 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")]
+    type Value: 'a
+        + From<&'a str>
+        + AsRef<str>
+        + std::borrow::Borrow<str>
+        + PartialEq
+        + Eq
+        + PartialOrd
+        + Ord
+        + fmt::Debug
+        + Clone
+        + Serialize;
+
+    #[cfg(not(feature = "serde"))]
     type Value: 'a
         + From<&'a str>
         + AsRef<str>

src/format.rs

@@ -3,7 +3,6 @@ use std::default::Default;
 
 use crate::common::Directive;
 
-
 #[derive(Debug, PartialEq)]
 pub(crate) struct Formatter<'a> {
     buf: String,
@@ -171,13 +170,16 @@ impl<'a> Formatter<'a> {
     }
 
     fn dec_indent(&mut self) {
-        self.indent = self.indent.checked_sub(self.style.indent)
+        self.indent = self
+            .indent
+            .checked_sub(self.style.indent)
             .expect("negative indent");
     }
 }
 
-pub(crate) fn format_directives<'a, T>(dirs: &[Directive<'a, T>], f: &mut Formatter) 
-    where T: crate::common::Text<'a>,
+pub(crate) fn format_directives<'a, T>(dirs: &[Directive<'a, T>], f: &mut Formatter)
+where
+    T: crate::common::Text<'a>,
 {
     for dir in dirs {
         f.write(" ");
@@ -198,7 +200,7 @@ macro_rules! impl_display {
 
     ('a $($typ: ident, )+) => {
         $(
-            impl<'a, T> fmt::Display for $typ<'a, T> 
+            impl<'a, T> fmt::Display for $typ<'a, T>
                 where T: Text<'a>,
             {
                 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

src/lib.rs

@@ -91,20 +91,21 @@
 //!
 #![warn(missing_debug_implementations)]
 
-#[cfg(test)] #[macro_use] extern crate pretty_assertions;
-
+#[cfg(test)]
+#[macro_use]
+extern crate pretty_assertions;
 
 mod common;
 #[macro_use]
 mod format;
-mod position;
-mod tokenizer;
 mod helpers;
+mod position;
 pub mod query;
 pub mod schema;
+mod tokenizer;
 
+pub use crate::format::Style;
+pub use crate::position::Pos;
+pub use crate::query::minify_query;
 pub use crate::query::parse_query;
 pub use crate::schema::parse_schema;
-pub use crate::query::minify_query;
-pub use crate::position::Pos;
-pub use crate::format::Style;

src/query/error.rs

@@ -1,12 +1,11 @@
 use combine::easy::Errors;
 use thiserror::Error;
 
-use crate::tokenizer::Token;
 use crate::position::Pos;
+use crate::tokenizer::Token;
 
 pub type InternalError<'a> = Errors<Token<'a>, Token<'a>, Pos>;
 
-
 /// Error parsing query
 ///
 /// This structure is opaque for forward compatibility. We are exploring a

src/query/mod.rs

@@ -6,7 +6,7 @@ mod format;
 mod grammar;
 mod minify;
 
-pub use self::grammar::{parse_query, consume_definition};
-pub use self::error::ParseError;
 pub use self::ast::*;
+pub use self::error::ParseError;
+pub use self::grammar::{consume_definition, parse_query};
 pub use self::minify::minify_query;

src/schema/error.rs

@@ -1,12 +1,11 @@
 use combine::easy::Errors;
 use thiserror::Error;
 
-use crate::tokenizer::Token;
 use crate::position::Pos;
+use crate::tokenizer::Token;
 
 pub type InternalError<'a> = Errors<Token<'a>, Token<'a>, Pos>;
 
-
 /// Error parsing schema
 ///
 /// This structure is opaque for forward compatibility. We are exploring a

src/schema/mod.rs

@@ -1,9 +1,9 @@
 //! Schema definition language AST and utility
 //!
 mod ast;
-mod grammar;
 mod error;
 mod format;
+mod grammar;
 
 pub use self::ast::*;
 pub use self::error::ParseError;