diff options
Diffstat (limited to 'Data')
| -rw-r--r-- | Data/GraphQL/AST.hs | 4 | ||||
| -rw-r--r-- | Data/GraphQL/Encoder.hs | 4 | ||||
| -rw-r--r-- | Data/GraphQL/Execute.hs | 2 | ||||
| -rw-r--r-- | Data/GraphQL/Parser.hs | 4 | ||||
| -rw-r--r-- | Data/GraphQL/Schema.hs | 1 |
5 files changed, 6 insertions, 9 deletions
diff --git a/Data/GraphQL/AST.hs b/Data/GraphQL/AST.hs index 1303908..2703a5b 100644 --- a/Data/GraphQL/AST.hs +++ b/Data/GraphQL/AST.hs @@ -68,14 +68,12 @@ data Value = ValueVariable Variable -- GraphQL Float is double precison | ValueFloat Double | ValueBoolean Bool - | ValueString StringValue + | ValueString Text | ValueEnum Name | ValueList ListValue | ValueObject ObjectValue deriving (Eq,Show) -newtype StringValue = StringValue Text deriving (Eq,Show) - newtype ListValue = ListValue [Value] deriving (Eq,Show) newtype ObjectValue = ObjectValue [ObjectField] deriving (Eq,Show) diff --git a/Data/GraphQL/Encoder.hs b/Data/GraphQL/Encoder.hs index 9eed849..2b7e239 100644 --- a/Data/GraphQL/Encoder.hs +++ b/Data/GraphQL/Encoder.hs @@ -106,8 +106,8 @@ booleanValue True = "true" booleanValue False = "false" -- TODO: Escape characters -stringValue :: StringValue -> Text -stringValue (StringValue v) = quotes v +stringValue :: Text -> Text +stringValue = quotes listValue :: ListValue -> Text listValue (ListValue vs) = bracketsCommas value vs diff --git a/Data/GraphQL/Execute.hs b/Data/GraphQL/Execute.hs index 8d0335d..47d1d03 100644 --- a/Data/GraphQL/Execute.hs +++ b/Data/GraphQL/Execute.hs @@ -37,5 +37,5 @@ substitute _ sel = sel -- TODO: Support different value types subsArg :: Schema.Subs -> Argument -> Maybe Argument subsArg subs (Argument n (ValueVariable (Variable v))) = - Argument n . ValueString . StringValue <$> subs v + Argument n . ValueString <$> subs v subsArg _ arg = Just arg diff --git a/Data/GraphQL/Parser.hs b/Data/GraphQL/Parser.hs index 1f5b8e6..6658af0 100644 --- a/Data/GraphQL/Parser.hs +++ b/Data/GraphQL/Parser.hs @@ -169,8 +169,8 @@ booleanValue = True <$ tok "true" <|> False <$ tok "false" -- TODO: Escape characters. Look at `jsstring_` in aeson package. -stringValue :: Parser StringValue -stringValue = StringValue <$> quotes (takeWhile (/= '"')) +stringValue :: Parser Text +stringValue = quotes (takeWhile (/= '"')) -- Notice it can be empty listValue :: Parser ListValue diff --git a/Data/GraphQL/Schema.hs b/Data/GraphQL/Schema.hs index 10cd691..1c45af2 100644 --- a/Data/GraphQL/Schema.hs +++ b/Data/GraphQL/Schema.hs @@ -18,7 +18,6 @@ module Data.GraphQL.Schema , Field , Argument(..) , Value(..) - , StringValue(..) ) where #if !MIN_VERSION_base(4,8,0) |