2 files changed, 10 insertions, 14 deletions
diff --git a/Data/GraphQL/Parser.hs b/Data/GraphQL/Parser.hs
index 3ff780c..00e4df1 100644
--- a/Data/GraphQL/Parser.hs
+++ b/Data/GraphQL/Parser.hs
@@ -14,7 +14,6 @@ import Data.Char
 import Data.Foldable (traverse_)
 
 import Data.Text (Text, append)
-import qualified Data.Text as T
 import Data.Attoparsec.Text
   ( Parser
   , (<?>)
@@ -29,7 +28,6 @@ import Data.Attoparsec.Text
   , peekChar
   , sepBy1
   , signed
-  , takeText
   , takeWhile
   , takeWhile1
   )
@@ -170,15 +168,9 @@ booleanValue :: Parser Bool
 booleanValue = True  <$ tok "true"
    <|> False <$ tok "false"
 
+-- TODO: Escape characters. Look at `jsstring_` in aeson package.
 stringValue :: Parser StringValue
-stringValue = StringValue <$> quotes (T.foldl' step mempty <$> takeText)
-  where
-    -- TODO: Handle unicode and the rest of escaped chars.
-    step acc c
-        | T.null acc = T.singleton c
-        | T.last acc == '\\' = if c == '"' then T.init acc `T.snoc` '"'
-                                           else acc `T.snoc` c
-        | otherwise = acc `T.snoc` c
+stringValue = StringValue <$> quotes (takeWhile (/= '"'))
 
 -- Notice it can be empty
 listValue :: Parser ListValue
@@ -205,9 +197,9 @@ directive = Directive
 -- * Type Reference
 
 type_ :: Parser Type
-type_ = TypeNamed   <$> namedType
-    <|> TypeList    <$> listType
+type_ = TypeList    <$> listType
     <|> TypeNonNull <$> nonNullType
+    <|> TypeNamed   <$> namedType
     <?> "type_ error!"
 
 namedType :: Parser NamedType
diff --git a/Data/GraphQL/Printer.hs b/Data/GraphQL/Printer.hs
index 4a4d67e..f241220 100644
--- a/Data/GraphQL/Printer.hs
+++ b/Data/GraphQL/Printer.hs
@@ -10,8 +10,9 @@ import Data.GraphQL.AST
 
 -- * Document
 
+-- TODO: Use query shorthand
 document :: Document -> Text
-document (Document defs) = mconcat $ definition <$> defs
+document (Document defs) = (`snoc` '\n') . mconcat $ definition <$> defs
 
 definition :: Definition -> Text
 definition (DefinitionOperation x) = operationDefinition x
@@ -102,7 +103,7 @@ booleanValue False = "false"
 
 -- TODO: Escape characters
 stringValue :: StringValue -> Text
-stringValue (StringValue x) = x
+stringValue (StringValue v) = quotes v
 
 listValue :: ListValue -> Text
 listValue (ListValue vs) = bracketsCommas value vs
@@ -222,6 +223,9 @@ brackets = between '[' ']'
 braces :: Text -> Text
 braces = between '{' '}'
 
+quotes :: Text -> Text
+quotes = between '"' '"'
+
 spaces :: (a -> Text) -> [a] -> Text
 spaces f = intercalate "\SP" . fmap f