on master help sign in
3 files changed+114−74
since splitsnapshots
unifiedsplit
cabal.project+11 id.cabal+61−53 src/Data/Id.hs+42−21
cabal.projectnew file+11
@@ -0,0 +1,11 @@
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+61−53
@@ -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
25
3−name: id
4−version: 0.2.0.0
5−license-file: LICENSE
6+flag cassava
7+ description: Enable Postgresql support
8+ default: True
9+ manual: False
610
7−Flag cassava
8− Description: Enable Postgresql support
9− Default: True
10− Manual: False
11+flag postgres
12+ description: Enable Postgresql support
13+ default: True
14+ manual: False
1115
16+flag flat
17+ description: Enable Flat serialization support
18+ default: True
19+ manual: False
1220
13−Flag postgres
14− Description: Enable Postgresql support
15− Default: True
16− Manual: False
21+flag store
22+ description: Enable Data.Store serialization support
23+ default: False
24+ manual: False
1725
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
26+flag uuid-impl
27+ description: Include some functions with extra dependencies.
28+ Disable to reduce dependencies.
29+ default: True
30+ manual: False
2731
2832library
29− exposed-modules:
30− Data.Id
31− -- other-modules:
32− -- other-extensions:
33+ exposed-modules: Data.Id
3334 build-depends:
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)
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)
4746 build-depends:
48− postgresql-simple
49− cpp-options: -DUSE_POSTGRES
50− if flag(cassava) && !impl(ghcjs)
47+ , uuid >=1.3.9
48+ cpp-options: -DUSE_UUID
49+
50+ if !(impl(ghcjs) || arch(javascript) || arch(wasm32))
5151 build-depends:
52− cassava
53− cpp-options: -DUSE_CASSAVA
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+
5465 if flag(flat)
55− build-depends:
56− flat,
57− cpp-options: -DUSE_FLAT
66+ build-depends: flat >=0.4
67+ cpp-options: -DUSE_FLAT
68+
5869 if flag(store)
59− build-depends:
60− store,
61− cpp-options: -DUSE_STORE
70+ build-depends: store
71+ cpp-options: -DUSE_STORE
6272
63− hs-source-dirs:
64− src
65− default-language:
66− Haskell2010
73+ hs-source-dirs: src
74+ default-language: Haskell2010
6775 default-extensions:
6876 AllowAmbiguousTypes
6977 DeriveGeneric
src/Data/Id.hs+42−21
@@ -4,9 +4,12 @@
44{-# OPTIONS_GHC -Wno-orphans #-}
55
66module Data.Id
7− ( Id, mkId, unId, randomId, unsafeIdTagConvert, coerceId, _Id, nilId
7+ ( Id, mkId, unId, 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
1013 )
1114 where
1215
@@ -18,13 +21,22 @@ import Data.Binary (Binary)
1821import Data.Coerce (coerce)
1922import Data.Data
2023import Data.Hashable (Hashable)
21−import Data.OpenApi
2224import Data.String
2325import Data.Text as T
24−import Data.UUID (UUID)
25−import qualified Data.UUID as UUID
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
2635import 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
2840#ifdef USE_CASSAVA
2941import Data.Csv as Csv hiding(Name)
3042#endif
@@ -33,11 +45,7 @@ import Database.PostgreSQL.Simple.FromField as PG (FromField)
3345import Database.PostgreSQL.Simple.ToField as PG (ToField)
3446#endif
3547#endif
36−import GHC.TypeLits
37−import Test.QuickCheck
38−import Text.ParserCombinators.ReadP
39−import Web.HttpApiData
40−import Web.PathPieces (PathPiece(..))
48+
4149#ifdef USE_FLAT
4250import Flat as F
4351#endif
@@ -54,8 +62,11 @@ newtype Id t = Id { unId :: UUID }
5462 , PG.ToField, PG.FromField
5563#endif
5664#endif
57− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
58− , ToParamSchema, FromHttpApiData, ToHttpApiData )
65+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
66+#ifdef BACKEND
67+ , ToSchema, ToParamSchema
68+#endif
69+ , FromHttpApiData, ToHttpApiData )
5970
6071type role Id nominal
6172
@@ -65,12 +76,14 @@ mkId :: forall s. UUID -> Id s
6576mkId = coerce
6677{-# INLINE mkId #-}
6778
79+#ifdef USE_UUID
6880randomId :: forall s. IO (Id s)
6981randomId = coerce <$> UUID.V4.nextRandom
7082{-# INLINE randomId #-}
83+#endif
7184
7285instance KnownSymbol s => Show (Id s) where
73− show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> show v
86+ show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
7487
7588instance KnownSymbol s => Read (Id s) where
7689 readsPrec _ = readP_to_S $ do
@@ -91,12 +104,14 @@ instance Data.Store.Store (Id s) where
91104 size = Data.Store.ConstSize 16
92105#endif
93106
107+#ifdef BACKEND
94108instance Arbitrary (Id t) where
95109 arbitrary = fmap Id $ UUID.fromWords
96110 <$> arbitrary
97111 <*> arbitrary
98112 <*> arbitrary
99113 <*> arbitrary
114+#endif
100115
101116instance PathPiece (Id t) where
102117 fromPathPiece = coerce . UUID.fromText
@@ -144,16 +159,18 @@ newtype IntId t = IntId { unIntId :: Integer }
144159#ifdef USE_CASSAVA
145160 , Csv.ToField, Csv.FromField
146161#endif
162+#endif
147163#ifdef USE_FLAT
148164 , Flat
149165#endif
150166#ifdef USE_STORE
151167 , Data.Store.Store
152168#endif
169+#ifdef BACKEND
170+ , ToSchema, ToParamSchema, Arbitrary
153171#endif
154− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
155− , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Arbitrary
156− , Num, Integral, Real, Enum )
172+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
173+ , ToHttpApiData, PathPiece, Num, Integral, Real, Enum )
157174
158175type role IntId nominal
159176
@@ -164,7 +181,7 @@ mkIntId = coerce
164181{-# INLINE mkIntId #-}
165182
166183instance KnownSymbol s => Show (IntId s) where
167− show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> show v
184+ show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> P.show v
168185
169186instance KnownSymbol s => Read (IntId s) where
170187 readsPrec _ = readP_to_S $ do
@@ -193,16 +210,18 @@ newtype Name t = Name { unName :: Text }
193210#ifdef USE_CASSAVA
194211 , Csv.ToField, Csv.FromField
195212#endif
213+#endif
196214#ifdef USE_FLAT
197215 , Flat
198216#endif
199217#ifdef USE_STORE
200218 , Data.Store.Store
201219#endif
220+#ifdef BACKEND
221+ , ToSchema, ToParamSchema
202222#endif
203− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
204− , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece
205− , IsString, Semigroup, Monoid )
223+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
224+ , ToHttpApiData, PathPiece, IsString, Semigroup, Monoid )
206225
207226type role Name nominal
208227
@@ -213,15 +232,17 @@ mkName = coerce
213232{-# INLINE mkName #-}
214233
215234instance KnownSymbol s => Show (Name s) where
216− show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> show v
235+ show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> P.show v
217236
218237instance KnownSymbol s => Read (Name s) where
219238 readsPrec _ = readP_to_S $ do
220239 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
221240 mkName <$> readS_to_P reads
222241
242+#ifdef BACKEND
223243instance Arbitrary (Name s) where
224244 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
245+#endif
225246
226247-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
227248-- You are forced to explicitly specify the phantom types you are converting