Add String instances from ToGraphQL and FromGraphQL
This commit is contained in:
parent
b399bddb90
commit
88f41271eb
@ -6,6 +6,13 @@ The format is based on
|
|||||||
and this project adheres to
|
and this project adheres to
|
||||||
[Haskell Package Versioning Policy](https://pvp.haskell.org/).
|
[Haskell Package Versioning Policy](https://pvp.haskell.org/).
|
||||||
|
|
||||||
|
## [Unreleased]
|
||||||
|
### Removed
|
||||||
|
- Deprecated `Language.GraphQL.Class.gql` (moved to `Language.GraphQL.TH`).
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- `String` instances from `ToGraphQL` and `FromGraphQL`.
|
||||||
|
|
||||||
## [1.0.6.0] - 2024-12-06
|
## [1.0.6.0] - 2024-12-06
|
||||||
### Added
|
### Added
|
||||||
- `Language.GraphQL.Class.gql` is moved to `Language.GraphQL.TH` where it was
|
- `Language.GraphQL.Class.gql` is moved to `Language.GraphQL.TH` where it was
|
||||||
@ -46,6 +53,7 @@ and this project adheres to
|
|||||||
- JSON serialization.
|
- JSON serialization.
|
||||||
- Test helpers.
|
- Test helpers.
|
||||||
|
|
||||||
|
[Unreleased]: https://git.caraus.tech/OSS/graphql-spice/compare/v1.0.6.0...master
|
||||||
[1.0.6.0]: https://git.caraus.tech/OSS/graphql-spice/compare/v1.0.5.0...v1.0.6.0
|
[1.0.6.0]: https://git.caraus.tech/OSS/graphql-spice/compare/v1.0.5.0...v1.0.6.0
|
||||||
[1.0.5.0]: https://git.caraus.tech/OSS/graphql-spice/compare/v1.0.4.0...v1.0.5.0
|
[1.0.5.0]: https://git.caraus.tech/OSS/graphql-spice/compare/v1.0.4.0...v1.0.5.0
|
||||||
[1.0.4.0]: https://git.caraus.tech/OSS/graphql-spice/compare/v1.0.3.0...v1.0.4.0
|
[1.0.4.0]: https://git.caraus.tech/OSS/graphql-spice/compare/v1.0.3.0...v1.0.4.0
|
||||||
|
@ -14,7 +14,6 @@ module Language.GraphQL.Class
|
|||||||
, ToGraphQL(..)
|
, ToGraphQL(..)
|
||||||
, deriveFromGraphQL
|
, deriveFromGraphQL
|
||||||
, deriveToGraphQL
|
, deriveToGraphQL
|
||||||
, gql
|
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Data.Int (Int8, Int16, Int32, Int64)
|
import Data.Int (Int8, Int16, Int32, Int64)
|
||||||
@ -47,7 +46,6 @@ import Language.Haskell.TH
|
|||||||
, Dec(..)
|
, Dec(..)
|
||||||
, Exp(..)
|
, Exp(..)
|
||||||
, Info(..)
|
, Info(..)
|
||||||
, Lit(..)
|
|
||||||
, Quote(..)
|
, Quote(..)
|
||||||
, Name
|
, Name
|
||||||
, Q
|
, Q
|
||||||
@ -75,7 +73,6 @@ import Language.Haskell.TH
|
|||||||
, litP
|
, litP
|
||||||
, wildP
|
, wildP
|
||||||
)
|
)
|
||||||
import Language.Haskell.TH.Quote (QuasiQuoter(..))
|
|
||||||
import Data.Foldable (Foldable(..))
|
import Data.Foldable (Foldable(..))
|
||||||
import qualified Data.HashMap.Strict as HashMap
|
import qualified Data.HashMap.Strict as HashMap
|
||||||
import qualified Language.GraphQL.Type as Type
|
import qualified Language.GraphQL.Type as Type
|
||||||
@ -110,6 +107,10 @@ instance ToGraphQL Text
|
|||||||
where
|
where
|
||||||
toGraphQL = Type.String
|
toGraphQL = Type.String
|
||||||
|
|
||||||
|
instance ToGraphQL String
|
||||||
|
where
|
||||||
|
toGraphQL = Type.String . Text.pack
|
||||||
|
|
||||||
instance ToGraphQL Int
|
instance ToGraphQL Int
|
||||||
where
|
where
|
||||||
toGraphQL = Type.Int . fromIntegral
|
toGraphQL = Type.Int . fromIntegral
|
||||||
@ -222,6 +223,11 @@ instance FromGraphQL Text
|
|||||||
fromGraphQL (Type.String value) = Just value
|
fromGraphQL (Type.String value) = Just value
|
||||||
fromGraphQL _ = Nothing
|
fromGraphQL _ = Nothing
|
||||||
|
|
||||||
|
instance FromGraphQL String
|
||||||
|
where
|
||||||
|
fromGraphQL (Type.String value) = Just $ Text.unpack value
|
||||||
|
fromGraphQL _ = Nothing
|
||||||
|
|
||||||
instance FromGraphQL Int
|
instance FromGraphQL Int
|
||||||
where
|
where
|
||||||
fromGraphQL = fromGraphQLToIntegral
|
fromGraphQL = fromGraphQLToIntegral
|
||||||
@ -459,40 +465,3 @@ deriveToGraphQL typeName = do
|
|||||||
[ litE (stringL $ nameBase name')
|
[ litE (stringL $ nameBase name')
|
||||||
, [|toGraphQL $(varE alias)|]
|
, [|toGraphQL $(varE alias)|]
|
||||||
]
|
]
|
||||||
|
|
||||||
stripIndentation :: String -> String
|
|
||||||
stripIndentation code = reverse
|
|
||||||
$ dropWhile isLineBreak
|
|
||||||
$ reverse
|
|
||||||
$ unlines
|
|
||||||
$ indent spaces <$> lines' withoutLeadingNewlines
|
|
||||||
where
|
|
||||||
indent 0 xs = xs
|
|
||||||
indent count (' ' : xs) = indent (count - 1) xs
|
|
||||||
indent _ xs = xs
|
|
||||||
withoutLeadingNewlines = dropWhile isLineBreak code
|
|
||||||
spaces = length $ takeWhile (== ' ') withoutLeadingNewlines
|
|
||||||
lines' "" = []
|
|
||||||
lines' string =
|
|
||||||
let (line, rest) = break isLineBreak string
|
|
||||||
reminder =
|
|
||||||
case rest of
|
|
||||||
[] -> []
|
|
||||||
'\r' : '\n' : strippedString -> lines' strippedString
|
|
||||||
_ : strippedString -> lines' strippedString
|
|
||||||
in line : reminder
|
|
||||||
isLineBreak = flip any ['\n', '\r'] . (==)
|
|
||||||
|
|
||||||
-- | Removes leading and trailing newlines. Indentation of the first line is
|
|
||||||
-- removed from each line of the string.
|
|
||||||
{-# DEPRECATED gql "Use Language.GraphQL.TH.gql instead" #-}
|
|
||||||
gql :: QuasiQuoter
|
|
||||||
gql = QuasiQuoter
|
|
||||||
{ quoteExp = pure . LitE . StringL . stripIndentation
|
|
||||||
, quotePat = const
|
|
||||||
$ fail "Illegal gql QuasiQuote (allowed as expression only, used as a pattern)"
|
|
||||||
, quoteType = const
|
|
||||||
$ fail "Illegal gql QuasiQuote (allowed as expression only, used as a type)"
|
|
||||||
, quoteDec = const
|
|
||||||
$ fail "Illegal gql QuasiQuote (allowed as expression only, used as a declaration)"
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user