on 7bf424b help sign in
3 files changed+74−126
since splitsnapshots
unifiedsplit
cabal.project−11 id.cabal+53−61 src/Data/Id.hs+21−54
cabal.projectdeleted−11
@@ -1,11 +0,0 @@
1−packages:
2− .
3−
4−-- To compile with js-backend use this:
5−source-repository-package
6− type: git
7− location: https://github.com/typeable/uuid.git
8− tag: 49f50ae517de0e4d5dfbf783edc61e71cfd54d6b
9− subdir:
10− uuid
11− uuid-types
id.cabal+53−61
@@ -1,77 +1,69 @@
1−cabal-version: 2.4
2−name: id
3−version: 0.2.0.0
4−license-file: LICENSE
1+cabal-version: 2.4
52
6−flag cassava
7− description: Enable Postgresql support
8− default: True
9− manual: False
3+name: id
4+version: 0.2.0.0
5+license-file: LICENSE
106
11−flag postgres
12− description: Enable Postgresql support
13− default: True
14− manual: False
7+Flag cassava
8+ Description: Enable Postgresql support
9+ Default: True
10+ Manual: False
1511
16−flag flat
17− description: Enable Flat serialization support
18− default: True
19− manual: False
2012
21−flag store
22− description: Enable Data.Store serialization support
23− default: False
24− manual: False
13+Flag postgres
14+ Description: Enable Postgresql support
15+ Default: True
16+ Manual: False
2517
26−flag uuid-impl
27− description: Include some functions with extra dependencies.
28− Disable to reduce dependencies.
29− default: True
30− manual: False
18+Flag flat
19+ Description: Enable Flat serialization support
20+ Default: True
21+ Manual: False
22+
23+Flag store
24+ Description: Enable Data.Store serialization support
25+ Default: False
26+ Manual: False
3127
3228library
33− exposed-modules: Data.Id
29+ exposed-modules:
30+ Data.Id
31+ -- other-modules:
32+ -- other-extensions:
3433 build-depends:
35− , aeson >=1.0
36− , base >=4.12 && <5
37− , binary
38− , deepseq
39− , hashable
40− , http-api-data
41− , lens
42− , path-pieces
43− , text
44− , uuid-types
45− if flag(uuid-impl)
34+ aeson,
35+ base >=4.12 && <5,
36+ binary,
37+ deepseq,
38+ hashable,
39+ http-api-data,
40+ lens,
41+ openapi3,
42+ path-pieces,
43+ text,
44+ QuickCheck,
45+ uuid,
46+ if flag(postgres) && !impl(ghcjs)
4647 build-depends:
47− , uuid >=1.3.9
48− cpp-options: -DUSE_UUID
49−
50− if !(impl(ghcjs) || arch(javascript) || arch(wasm32))
48+ postgresql-simple
49+ cpp-options: -DUSE_POSTGRES
50+ if flag(cassava) && !impl(ghcjs)
5151 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)))
62− build-depends: cassava
63− cpp-options: -DUSE_CASSAVA
64−
52+ cassava
53+ cpp-options: -DUSE_CASSAVA
6554 if flag(flat)
66− build-depends: flat >=0.4
67− cpp-options: -DUSE_FLAT
68−
55+ build-depends:
56+ flat,
57+ cpp-options: -DUSE_FLAT
6958 if flag(store)
70− build-depends: store
71− cpp-options: -DUSE_STORE
59+ build-depends:
60+ store,
61+ cpp-options: -DUSE_STORE
7262
73− hs-source-dirs: src
74− default-language: Haskell2010
63+ hs-source-dirs:
64+ src
65+ default-language:
66+ Haskell2010
7567 default-extensions:
7668 AllowAmbiguousTypes
7769 DeriveGeneric
src/Data/Id.hs+21−54
@@ -4,12 +4,9 @@
44{-# OPTIONS_GHC -Wno-orphans #-}
55
66module Data.Id
7− ( Id, mkId, unId, unsafeIdTagConvert, coerceId, _Id, nilId
7+ ( Id, mkId, unId, randomId, unsafeIdTagConvert, coerceId, _Id, nilId
88 , IntId, mkIntId, unIntId, unsafeIntIdTagConvert, coerceIntId, _IntId
99 , Name, mkName, unName, unsafeNameTagConvert, coerceName, _Name
10−#ifdef USE_UUID
11− , randomId
12−#endif
1310 )
1411 where
1512
@@ -21,22 +18,13 @@ import Data.Binary (Binary)
2118import Data.Coerce (coerce)
2219import Data.Data
2320import Data.Hashable (Hashable)
21+import Data.OpenApi
2422import Data.String
2523import Data.Text as T
26−import Data.UUID.Types (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
24+import Data.UUID (UUID)
25+import qualified Data.UUID as UUID
3526import qualified Data.UUID.V4 as UUID.V4
36−#endif
37−#ifdef BACKEND
38−import Data.OpenApi
39−import Test.QuickCheck
27+#ifndef ghcjs_HOST_OS
4028#ifdef USE_CASSAVA
4129import Data.Csv as Csv hiding(Name)
4230#endif
@@ -45,7 +33,11 @@ import Database.PostgreSQL.Simple.FromField as PG (FromField)
4533import Database.PostgreSQL.Simple.ToField as PG (ToField)
4634#endif
4735#endif
48−
36+import GHC.TypeLits
37+import Test.QuickCheck
38+import Text.ParserCombinators.ReadP
39+import Web.HttpApiData
40+import Web.PathPieces (PathPiece(..))
4941#ifdef USE_FLAT
5042import Flat as F
5143#endif
@@ -62,11 +54,8 @@ newtype Id t = Id { unId :: UUID }
6254 , PG.ToField, PG.FromField
6355#endif
6456#endif
65− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
66−#ifdef BACKEND
67− , ToSchema, ToParamSchema
68−#endif
69− , FromHttpApiData, ToHttpApiData )
57+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
58+ , ToParamSchema, FromHttpApiData, ToHttpApiData )
7059
7160type role Id nominal
7261
@@ -76,14 +65,12 @@ mkId :: forall s. UUID -> Id s
7665mkId = coerce
7766{-# INLINE mkId #-}
7867
79−#ifdef USE_UUID
8068randomId :: forall s. IO (Id s)
8169randomId = coerce <$> UUID.V4.nextRandom
8270{-# INLINE randomId #-}
83−#endif
8471
8572instance KnownSymbol s => Show (Id s) where
86− show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
73+ show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> show v
8774
8875instance KnownSymbol s => Read (Id s) where
8976 readsPrec _ = readP_to_S $ do
@@ -104,14 +91,12 @@ instance Data.Store.Store (Id s) where
10491 size = Data.Store.ConstSize 16
10592#endif
10693
107−#ifdef BACKEND
10894instance Arbitrary (Id t) where
10995 arbitrary = fmap Id $ UUID.fromWords
11096 <$> arbitrary
11197 <*> arbitrary
11298 <*> arbitrary
11399 <*> arbitrary
114−#endif
115100
116101instance PathPiece (Id t) where
117102 fromPathPiece = coerce . UUID.fromText
@@ -160,17 +145,9 @@ newtype IntId t = IntId { unIntId :: Integer }
160145 , Csv.ToField, Csv.FromField
161146#endif
162147#endif
163−#ifdef USE_FLAT
164− , Flat
165−#endif
166−#ifdef USE_STORE
167− , Data.Store.Store
168−#endif
169−#ifdef BACKEND
170− , ToSchema, ToParamSchema, Arbitrary
171−#endif
172− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
173− , ToHttpApiData, PathPiece, Num, Integral, Real, Enum )
148+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
149+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat, Arbitrary
150+ , Num, Integral, Real, Enum )
174151
175152type role IntId nominal
176153
@@ -181,7 +158,7 @@ mkIntId = coerce
181158{-# INLINE mkIntId #-}
182159
183160instance KnownSymbol s => Show (IntId s) where
184− show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> P.show v
161+ show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> show v
185162
186163instance KnownSymbol s => Read (IntId s) where
187164 readsPrec _ = readP_to_S $ do
@@ -211,17 +188,9 @@ newtype Name t = Name { unName :: Text }
211188 , Csv.ToField, Csv.FromField
212189#endif
213190#endif
214−#ifdef USE_FLAT
215− , Flat
216−#endif
217−#ifdef USE_STORE
218− , Data.Store.Store
219−#endif
220−#ifdef BACKEND
221− , ToSchema, ToParamSchema
222−#endif
223− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
224− , ToHttpApiData, PathPiece, IsString, Semigroup, Monoid )
191+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
192+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat
193+ , IsString, Semigroup, Monoid )
225194
226195type role Name nominal
227196
@@ -232,17 +201,15 @@ mkName = coerce
232201{-# INLINE mkName #-}
233202
234203instance KnownSymbol s => Show (Name s) where
235− show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> P.show v
204+ show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> show v
236205
237206instance KnownSymbol s => Read (Name s) where
238207 readsPrec _ = readP_to_S $ do
239208 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
240209 mkName <$> readS_to_P reads
241210
242−#ifdef BACKEND
243211instance Arbitrary (Name s) where
244212 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
245−#endif
246213
247214-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
248215-- You are forced to explicitly specify the phantom types you are converting