on master help sign in
cabal.projectnew file+11
since splitsnapshots
unifiedsplit
@@ -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−47
@@ -1,63 +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.1.0.0
7+ description: Enable Postgresql support
5−license-file: LICENSE
8+ default: True
9+ manual: False
6
10
11+flag postgres
12+ description: Enable Postgresql support
13+ default: True
14+ manual: False
7
15
8−Flag postgres
16+flag flat
9− Description: Enable Postgresql support
17+ description: Enable Flat serialization support
10− Default: True
18+ default: True
11− Manual: False
19+ manual: False
12
20
13−Flag flat
21+flag store
14− Description: Enable Flat serialization support
22+ description: Enable Data.Store serialization support
15− Default: True
23+ default: False
16− Manual: False
24+ manual: False
17
25
18−Flag store
26+flag uuid-impl
19− Description: Enable Data.Store serialization support
27+ description: Include some functions with extra dependencies.
20− Default: False
28+ Disable to reduce dependencies.
29+ default: True
21− Manual: False
30+ manual: False
22
31
23library
32library
24− exposed-modules:
33+ exposed-modules: Data.Id
25− Data.Id
26− -- other-modules:
27− -- other-extensions:
28 build-depends:
34 build-depends:
29− aeson,
35+ , aeson >=1.0
30− base >=4.12 && <5,
36+ , base >=4.12 && <5
31− binary,
37+ , binary
32− deepseq,
38+ , deepseq
33− hashable,
39+ , hashable
34− http-api-data,
40+ , http-api-data
35− lens,
41+ , lens
36− openapi3,
37− path-pieces,
42+ , path-pieces
38− text,
43+ , text
39− QuickCheck,
40− uuid,
44+ , uuid-types
41− if flag(postgres) && !impl(ghcjs)
45+ if flag(uuid-impl)
42 build-depends:
46 build-depends:
43− postgresql-simple
47+ , uuid >=1.3.9
44− cpp-options: -DUSE_POSTGRES
48+ cpp-options: -DUSE_UUID
49+
45− if !impl(ghcjs)
50+ if !(impl(ghcjs) || arch(javascript) || arch(wasm32))
46 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)))
47− cassava
62+ build-depends: cassava
63+ cpp-options: -DUSE_CASSAVA
64+
48 if flag(flat)
65 if flag(flat)
49− build-depends:
66+ build-depends: flat >=0.4
50− flat,
51− cpp-options: -DUSE_FLAT
67+ cpp-options: -DUSE_FLAT
68+
52 if flag(store)
69 if flag(store)
53− build-depends:
70+ build-depends: store
54− store,
55− cpp-options: -DUSE_STORE
71+ cpp-options: -DUSE_STORE
56
72
57− hs-source-dirs:
73+ hs-source-dirs: src
58− src
59− default-language:
74+ default-language: Haskell2010
60− Haskell2010
61 default-extensions:
75 default-extensions:
62 AllowAmbiguousTypes
76 AllowAmbiguousTypes
63 DeriveGeneric
77 DeriveGeneric
src/Data/Id.hs+66−23
@@ -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,24 +21,31 @@ 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
40+#ifdef USE_CASSAVA
28import Data.Csv as Csv hiding(Name)
41import Data.Csv as Csv hiding(Name)
42+#endif
29#ifdef USE_POSTGRES
43#ifdef USE_POSTGRES
30import Database.PostgreSQL.Simple.FromField as PG (FromField)
44import Database.PostgreSQL.Simple.FromField as PG (FromField)
31import Database.PostgreSQL.Simple.ToField as PG (ToField)
45import Database.PostgreSQL.Simple.ToField as PG (ToField)
32#endif
46#endif
33#endif
47#endif
34−import GHC.TypeLits
48+
35−import Test.QuickCheck
36−import Text.ParserCombinators.ReadP
37−import Web.HttpApiData
38−import Web.PathPieces (PathPiece(..))
39#ifdef USE_FLAT
49#ifdef USE_FLAT
40import Flat as F
50import Flat as F
41#endif
51#endif
@@ -52,8 +62,11 @@ newtype Id t = Id { unId :: UUID }
52 , PG.ToField, PG.FromField
62 , PG.ToField, PG.FromField
53#endif
63#endif
54#endif
64#endif
55− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
65+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
66+#ifdef BACKEND
67+ , ToSchema, ToParamSchema
68+#endif
56− , ToParamSchema, FromHttpApiData, ToHttpApiData )
69+ , FromHttpApiData, ToHttpApiData )
57
70
58type role Id nominal
71type role Id nominal
59
72
@@ -63,12 +76,14 @@ mkId :: forall s. UUID -> Id s
63mkId = coerce
76mkId = coerce
64{-# INLINE mkId #-}
77{-# INLINE mkId #-}
65
78
79+#ifdef USE_UUID
66randomId :: forall s. IO (Id s)
80randomId :: forall s. IO (Id s)
67randomId = coerce <$> UUID.V4.nextRandom
81randomId = coerce <$> UUID.V4.nextRandom
68{-# INLINE randomId #-}
82{-# INLINE randomId #-}
83+#endif
69
84
70instance KnownSymbol s => Show (Id s) where
85instance KnownSymbol s => Show (Id s) where
71− show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> show v
86+ show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
72
87
73instance KnownSymbol s => Read (Id s) where
88instance KnownSymbol s => Read (Id s) where
74 readsPrec _ = readP_to_S $ do
89 readsPrec _ = readP_to_S $ do
@@ -89,12 +104,14 @@ instance Data.Store.Store (Id s) where
89 size = Data.Store.ConstSize 16
104 size = Data.Store.ConstSize 16
90#endif
105#endif
91
106
107+#ifdef BACKEND
92instance Arbitrary (Id t) where
108instance Arbitrary (Id t) where
93 arbitrary = fmap Id $ UUID.fromWords
109 arbitrary = fmap Id $ UUID.fromWords
94 <$> arbitrary
110 <$> arbitrary
95 <*> arbitrary
111 <*> arbitrary
96 <*> arbitrary
112 <*> arbitrary
97 <*> arbitrary
113 <*> arbitrary
114+#endif
98
115
99instance PathPiece (Id t) where
116instance PathPiece (Id t) where
100 fromPathPiece = coerce . UUID.fromText
117 fromPathPiece = coerce . UUID.fromText
@@ -102,12 +119,14 @@ instance PathPiece (Id t) where
102
119
103#ifndef ghcjs_HOST_OS
120#ifndef ghcjs_HOST_OS
104
121
122+#ifdef USE_CASSAVA
105instance Csv.FromField (Id tag) where
123instance Csv.FromField (Id tag) where
106 parseField = parseField
124 parseField = parseField
107 >=> fmap mkId . maybe (fail "invalid UUID in CSV") pure . UUID.fromText
125 >=> fmap mkId . maybe (fail "invalid UUID in CSV") pure . UUID.fromText
108
126
109instance Csv.ToField (Id tag) where
127instance Csv.ToField (Id tag) where
110 toField = Csv.toField . UUID.toText . coerce
128 toField = Csv.toField . UUID.toText . coerce
129+#endif
111
130
112#endif
131#endif
113
132
@@ -135,12 +154,23 @@ newtype IntId t = IntId { unIntId :: Integer }
135 ( Eq, Ord, Binary
154 ( Eq, Ord, Binary
136#ifndef ghcjs_HOST_OS
155#ifndef ghcjs_HOST_OS
137#ifdef USE_POSTGRES
156#ifdef USE_POSTGRES
157+ , PG.ToField, PG.FromField
158+#endif
159+#ifdef USE_CASSAVA
138− , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
160+ , Csv.ToField, Csv.FromField
161+#endif
162+#endif
163+#ifdef USE_FLAT
164+ , Flat
165+#endif
166+#ifdef USE_STORE
167+ , Data.Store.Store
139#endif
168#endif
169+#ifdef BACKEND
170+ , ToSchema, ToParamSchema, Arbitrary
140#endif
171#endif
141− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
172+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
142− , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat, Arbitrary
143− , Num, Integral, Real, Enum )
173+ , ToHttpApiData, PathPiece, Num, Integral, Real, Enum )
144
174
145type role IntId nominal
175type role IntId nominal
146
176
@@ -151,7 +181,7 @@ mkIntId = coerce
151{-# INLINE mkIntId #-}
181{-# INLINE mkIntId #-}
152
182
153instance KnownSymbol s => Show (IntId s) where
183instance KnownSymbol s => Show (IntId s) where
154− show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> show v
184+ show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> P.show v
155
185
156instance KnownSymbol s => Read (IntId s) where
186instance KnownSymbol s => Read (IntId s) where
157 readsPrec _ = readP_to_S $ do
187 readsPrec _ = readP_to_S $ do
@@ -175,12 +205,23 @@ newtype Name t = Name { unName :: Text }
175 ( Eq, Ord, Binary
205 ( Eq, Ord, Binary
176#ifndef ghcjs_HOST_OS
206#ifndef ghcjs_HOST_OS
177#ifdef USE_POSTGRES
207#ifdef USE_POSTGRES
208+ , PG.ToField, PG.FromField
209+#endif
210+#ifdef USE_CASSAVA
178− , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
211+ , Csv.ToField, Csv.FromField
179#endif
212#endif
180#endif
213#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
181− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
223+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
182− , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat
183− , IsString, Semigroup, Monoid )
224+ , ToHttpApiData, PathPiece, IsString, Semigroup, Monoid )
184
225
185type role Name nominal
226type role Name nominal
186
227
@@ -191,15 +232,17 @@ mkName = coerce
191{-# INLINE mkName #-}
232{-# INLINE mkName #-}
192
233
193instance KnownSymbol s => Show (Name s) where
234instance KnownSymbol s => Show (Name s) where
194− show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> show v
235+ show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> P.show v
195
236
196instance KnownSymbol s => Read (Name s) where
237instance KnownSymbol s => Read (Name s) where
197 readsPrec _ = readP_to_S $ do
238 readsPrec _ = readP_to_S $ do
198 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
239 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
199 mkName <$> readS_to_P reads
240 mkName <$> readS_to_P reads
200
241
242+#ifdef BACKEND
201instance Arbitrary (Name s) where
243instance Arbitrary (Name s) where
202 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
244 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
245+#endif
203
246
204-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
247-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
205-- 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