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