git.iko.soy/typeable/id
on dea6728 help sign in
aa466ff
swap
1 ahead, 3 behind
id.cabal+5−20
since splitsnapshots
unifiedsplit
@@ -23,12 +23,6 @@ flag store
23 default: False
23 default: False
24 manual: False
24 manual: False
25
25
26−flag uuid-impl
27− description: Include some functions with extra dependencies.
28− Disable to reduce dependencies.
29− default: True
30− manual: False
31−
32library
26library
33 exposed-modules: Data.Id
27 exposed-modules: Data.Id
34 build-depends:
28 build-depends:
@@ -39,26 +33,17 @@ library
39 , hashable
33 , hashable
40 , http-api-data
34 , http-api-data
41 , lens
35 , lens
36+ , openapi3
42 , path-pieces
37 , path-pieces
38+ , QuickCheck
43 , text
39 , text
44− , uuid-types
40+ , uuid >=1.3.9
45− if flag(uuid-impl)
46− build-depends:
47− , uuid >=1.3.9
48− cpp-options: -DUSE_UUID
49−
50− if !(impl(ghcjs) || arch(javascript) || arch(wasm32))
51− build-depends:
52− , openapi3
53− , QuickCheck
54−
55− cpp-options: -DBACKEND
56
41
57− if (flag(postgres) && !(impl(ghcjs) || arch(javascript) || arch(wasm32)))
42+ if (flag(postgres) && !(impl(ghcjs) || arch(javascript)))
58 build-depends: postgresql-simple
43 build-depends: postgresql-simple
59 cpp-options: -DUSE_POSTGRES
44 cpp-options: -DUSE_POSTGRES
60
45
61− if (flag(cassava) && !(impl(ghcjs) || arch(javascript) || arch(wasm32)))
46+ if (flag(cassava) && !(impl(ghcjs) || arch(javascript)))
62 build-depends: cassava
47 build-depends: cassava
63 cpp-options: -DUSE_CASSAVA
48 cpp-options: -DUSE_CASSAVA
64
49
src/Data/Id.hs+17−34
@@ -4,12 +4,9 @@
4{-# OPTIONS_GHC -Wno-orphans #-}
4{-# OPTIONS_GHC -Wno-orphans #-}
5
5
6module Data.Id
6module Data.Id
7− ( Id, mkId, unId, unsafeIdTagConvert, coerceId, _Id, nilId
7+ ( Id, mkId, unId, randomId, unsafeIdTagConvert, coerceId, _Id, nilId
8 , IntId, mkIntId, unIntId, unsafeIntIdTagConvert, coerceIntId, _IntId
8 , IntId, mkIntId, unIntId, unsafeIntIdTagConvert, coerceIntId, _IntId
9 , Name, mkName, unName, unsafeNameTagConvert, coerceName, _Name
9 , Name, mkName, unName, unsafeNameTagConvert, coerceName, _Name
10−#ifdef USE_UUID
11− , randomId
12−#endif
13 )
10 )
14 where
11 where
15
12
@@ -21,22 +18,19 @@ import Data.Binary (Binary)
21import Data.Coerce (coerce)
18import Data.Coerce (coerce)
22import Data.Data
19import Data.Data
23import Data.Hashable (Hashable)
20import Data.Hashable (Hashable)
21+import Data.OpenApi
24import Data.String
22import Data.String
25import Data.Text as T
23import Data.Text as T
26−import Data.UUID.Types (UUID)
24+import Data.UUID (UUID)
27−import qualified Data.UUID.Types as UUID
25+import qualified Data.UUID as UUID
26+import qualified Data.UUID.V4 as UUID.V4
28import GHC.TypeLits
27import GHC.TypeLits
29import Prelude as P
28import Prelude as P
29+import Test.QuickCheck
30import Text.ParserCombinators.ReadP
30import Text.ParserCombinators.ReadP
31import Web.HttpApiData
31import Web.HttpApiData
32import Web.PathPieces (PathPiece(..))
32import Web.PathPieces (PathPiece(..))
33
33
34−#ifdef USE_UUID
35−import qualified Data.UUID.V4 as UUID.V4
36−#endif
37−#ifdef BACKEND
38−import Data.OpenApi
39−import Test.QuickCheck
40#ifdef USE_CASSAVA
34#ifdef USE_CASSAVA
41import Data.Csv as Csv hiding(Name)
35import Data.Csv as Csv hiding(Name)
42#endif
36#endif
@@ -44,7 +38,6 @@ import Data.Csv as Csv hiding(Name)
44import Database.PostgreSQL.Simple.FromField as PG (FromField)
38import Database.PostgreSQL.Simple.FromField as PG (FromField)
45import Database.PostgreSQL.Simple.ToField as PG (ToField)
39import Database.PostgreSQL.Simple.ToField as PG (ToField)
46#endif
40#endif
47−#endif
48
41
49#ifdef USE_FLAT
42#ifdef USE_FLAT
50import Flat as F
43import Flat as F
@@ -62,11 +55,9 @@ newtype Id t = Id { unId :: UUID }
62 , PG.ToField, PG.FromField
55 , PG.ToField, PG.FromField
63#endif
56#endif
64#endif
57#endif
65− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
58+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
66−#ifdef BACKEND
67− , ToSchema, ToParamSchema
68−#endif
69− , FromHttpApiData, ToHttpApiData )
59+ , ToParamSchema, FromHttpApiData, ToHttpApiData
60+ )
70
61
71type role Id nominal
62type role Id nominal
72
63
@@ -76,11 +67,9 @@ mkId :: forall s. UUID -> Id s
76mkId = coerce
67mkId = coerce
77{-# INLINE mkId #-}
68{-# INLINE mkId #-}
78
69
79−#ifdef USE_UUID
80randomId :: forall s. IO (Id s)
70randomId :: forall s. IO (Id s)
81randomId = coerce <$> UUID.V4.nextRandom
71randomId = coerce <$> UUID.V4.nextRandom
82{-# INLINE randomId #-}
72{-# INLINE randomId #-}
83−#endif
84
73
85instance KnownSymbol s => Show (Id s) where
74instance KnownSymbol s => Show (Id s) where
86 show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
75 show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
@@ -104,14 +93,12 @@ instance Data.Store.Store (Id s) where
104 size = Data.Store.ConstSize 16
93 size = Data.Store.ConstSize 16
105#endif
94#endif
106
95
107−#ifdef BACKEND
108instance Arbitrary (Id t) where
96instance Arbitrary (Id t) where
109 arbitrary = fmap Id $ UUID.fromWords
97 arbitrary = fmap Id $ UUID.fromWords
110 <$> arbitrary
98 <$> arbitrary
111 <*> arbitrary
99 <*> arbitrary
112 <*> arbitrary
100 <*> arbitrary
113 <*> arbitrary
101 <*> arbitrary
114−#endif
115
102
116instance PathPiece (Id t) where
103instance PathPiece (Id t) where
117 fromPathPiece = coerce . UUID.fromText
104 fromPathPiece = coerce . UUID.fromText
@@ -166,11 +153,10 @@ newtype IntId t = IntId { unIntId :: Integer }
166#ifdef USE_STORE
153#ifdef USE_STORE
167 , Data.Store.Store
154 , Data.Store.Store
168#endif
155#endif
169−#ifdef BACKEND
170− , ToSchema, ToParamSchema, Arbitrary
156+ , ToSchema, ToParamSchema, Arbitrary, FromJSON, ToJSON, NFData, Hashable
171−#endif
172− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
157+ , FromJSONKey, ToJSONKey, FromHttpApiData, ToHttpApiData, PathPiece, Num
173− , ToHttpApiData, PathPiece, Num, Integral, Real, Enum )
158+ , Integral, Real, Enum
159+ )
174
160
175type role IntId nominal
161type role IntId nominal
176
162
@@ -217,11 +203,10 @@ newtype Name t = Name { unName :: Text }
217#ifdef USE_STORE
203#ifdef USE_STORE
218 , Data.Store.Store
204 , Data.Store.Store
219#endif
205#endif
220−#ifdef BACKEND
221− , ToSchema, ToParamSchema
222−#endif
223− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
206+ , ToSchema, ToParamSchema, FromJSON, ToJSON, NFData, Hashable, FromJSONKey
224− , ToHttpApiData, PathPiece, IsString, Semigroup, Monoid )
207+ , ToJSONKey, FromHttpApiData, ToHttpApiData, PathPiece, IsString, Semigroup
208+ , Monoid
209+ )
225
210
226type role Name nominal
211type role Name nominal
227
212
@@ -239,10 +224,8 @@ instance KnownSymbol s => Read (Name s) where
239 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
224 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
240 mkName <$> readS_to_P reads
225 mkName <$> readS_to_P reads
241
226
242−#ifdef BACKEND
243instance Arbitrary (Name s) where
227instance Arbitrary (Name s) where
244 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
228 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
245−#endif
246
229
247-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
230-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
248-- You are forced to explicitly specify the phantom types you are converting
231-- You are forced to explicitly specify the phantom types you are converting