b2ff991 · typeable/openapi3

git.iko.soy/typeable/openapi3

on master help sign in

Merge pull request #84 from phadej/pr78

b2ff991Oleg Grenrus10 years ago

src/Data/Swagger/Internal/ParamSchema.hs+22

compare with master

unifiedsplit

@@ -1,4 +1,5 @@

1{-# LANGUAGE CPP #-}

2+{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DefaultSignatures #-}

3{-# LANGUAGE DefaultSignatures #-}

3{-# LANGUAGE FlexibleContexts #-}

4{-# LANGUAGE FlexibleContexts #-}

4{-# LANGUAGE FlexibleInstances #-}

5{-# LANGUAGE FlexibleInstances #-}

@@ -7,8 +8,10 @@

7{-# LANGUAGE PackageImports #-}

8{-# LANGUAGE PackageImports #-}

8{-# LANGUAGE PolyKinds #-}

9{-# LANGUAGE PolyKinds #-}

9{-# LANGUAGE ScopedTypeVariables #-}

10{-# LANGUAGE ScopedTypeVariables #-}

11+{-# LANGUAGE TypeFamilies #-}

10{-# LANGUAGE TypeOperators #-}

12{-# LANGUAGE TypeOperators #-}

11{-# LANGUAGE TypeSynonymInstances #-}

13{-# LANGUAGE TypeSynonymInstances #-}

14+{-# LANGUAGE UndecidableInstances #-}

12#if __GLASGOW_HASKELL__ >= 800

15#if __GLASGOW_HASKELL__ >= 800

13-- Generic a is redundant in ToParamSchema a default imple

16-- Generic a is redundant in ToParamSchema a default imple

14{-# OPTIONS_GHC -Wno-redundant-constraints #-}

17{-# OPTIONS_GHC -Wno-redundant-constraints #-}

@@ -40,6 +43,13 @@ import Data.Swagger.Internal

40import Data.Swagger.Lens

43import Data.Swagger.Lens

41import Data.Swagger.SchemaOptions

44import Data.Swagger.SchemaOptions

46+#if __GLASGOW_HASKELL__ < 800

47+#else

48+import qualified Data.ByteString as BS

49+import qualified Data.ByteString.Lazy as BSL

50+import GHC.TypeLits (TypeError, ErrorMessage(..))

51+#endif

52+

43-- | Default schema for binary data (any sequence of octets).

53-- | Default schema for binary data (any sequence of octets).

44binaryParamSchema :: ParamSchema t

54binaryParamSchema :: ParamSchema t

45binaryParamSchema = mempty

55binaryParamSchema = mempty

@@ -193,6 +203,18 @@ instance ToParamSchema T.Text where

193instance ToParamSchema TL.Text where

203instance ToParamSchema TL.Text where

194 toParamSchema _ = toParamSchema (Proxy :: Proxy String)

204 toParamSchema _ = toParamSchema (Proxy :: Proxy String)

195

205

206+#if __GLASGOW_HASKELL__ < 800

207+#else

208+type family ToParamSchemaByteStringError bs where

209+ ToParamSchemaByteStringError bs = TypeError

210+ ( Text "Impossible to have an instance " :<>: ShowType (ToParamSchema bs) :<>: Text "."

211+ :$$: Text "Please, use a newtype wrapper around " :<>: ShowType bs :<>: Text " instead."

212+ :$$: Text "Consider using byteParamSchema or binaryParamSchema templates." )

213+

214+instance ToParamSchemaByteStringError BS.ByteString => ToParamSchema BS.ByteString where toParamSchema = error "impossible"

215+instance ToParamSchemaByteStringError BSL.ByteString => ToParamSchema BSL.ByteString where toParamSchema = error "impossible"

216+#endif

217+

196instance ToParamSchema All where toParamSchema _ = toParamSchema (Proxy :: Proxy Bool)

218instance ToParamSchema All where toParamSchema _ = toParamSchema (Proxy :: Proxy Bool)

197instance ToParamSchema Any where toParamSchema _ = toParamSchema (Proxy :: Proxy Bool)

219instance ToParamSchema Any where toParamSchema _ = toParamSchema (Proxy :: Proxy Bool)

198instance ToParamSchema a => ToParamSchema (Sum a) where toParamSchema _ = toParamSchema (Proxy :: Proxy a)

220instance ToParamSchema a => ToParamSchema (Sum a) where toParamSchema _ = toParamSchema (Proxy :: Proxy a)

src/Data/Swagger/Internal/Schema.hs+20

@@ -13,6 +13,7 @@

13{-# LANGUAGE TypeFamilies #-}

14{-# LANGUAGE TypeOperators #-}

15{-# LANGUAGE TypeSynonymInstances #-}

16+{-# LANGUAGE UndecidableInstances #-}

16#if __GLASGOW_HASKELL__ >= 800

17#if __GLASGOW_HASKELL__ >= 800

17-- Few generics related redundant constraints

18-- Few generics related redundant constraints

18{-# OPTIONS_GHC -Wno-redundant-constraints #-}

19{-# OPTIONS_GHC -Wno-redundant-constraints #-}

@@ -66,6 +67,13 @@ import Data.Swagger.SchemaOptions

66import Data.Swagger.Lens (name, schema)

67import Data.Swagger.Lens (name, schema)

67#endif

68#endif

70+#if __GLASGOW_HASKELL__ < 800

71+#else

72+import qualified Data.ByteString as BS

73+import qualified Data.ByteString.Lazy as BSL

74+import GHC.TypeLits (TypeError, ErrorMessage(..))

75+#endif

76+

69unnamed :: Schema -> NamedSchema

77unnamed :: Schema -> NamedSchema

70unnamed schema = NamedSchema Nothing schema

78unnamed schema = NamedSchema Nothing schema

@@ -481,6 +489,18 @@ instance ToSchema UTCTime where

481instance ToSchema T.Text where declareNamedSchema = plain . paramSchemaToSchema

489instance ToSchema T.Text where declareNamedSchema = plain . paramSchemaToSchema

482instance ToSchema TL.Text where declareNamedSchema = plain . paramSchemaToSchema

490instance ToSchema TL.Text where declareNamedSchema = plain . paramSchemaToSchema

483

491

492+#if __GLASGOW_HASKELL__ < 800

493+#else

494+type family ToSchemaByteStringError bs where

495+ ToSchemaByteStringError bs = TypeError

496+ ( Text "Impossible to have an instance " :<>: ShowType (ToSchema bs) :<>: Text "."

497+ :$$: Text "Please, use a newtype wrapper around " :<>: ShowType bs :<>: Text " instead."

498+ :$$: Text "Consider using byteSchema or binarySchema templates." )

499+

500+instance ToSchemaByteStringError BS.ByteString => ToSchema BS.ByteString where declareNamedSchema = error "impossible"

501+instance ToSchemaByteStringError BSL.ByteString => ToSchema BSL.ByteString where declareNamedSchema = error "impossible"

502+#endif

503+

484instance ToSchema IntSet where declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy (Set Int))

504instance ToSchema IntSet where declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy (Set Int))

485

505

486-- | NOTE: This schema does not account for the uniqueness of keys.

506-- | NOTE: This schema does not account for the uniqueness of keys.

swagger2.cabal+1

@@ -42,6 +42,7 @@ library

42 build-depends: base >=4.7 && <4.10

43 , base-compat >=0.9.1 && <0.10

44 , aeson >=0.11.2.1

45+ , bytestring

45 , containers

46 , containers

46 , hashable

47 , hashable

47 , generics-sop >=0.2 && <0.3

48 , generics-sop >=0.2 && <0.3