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