@@ -7,9 +7,6 @@ module Data.Id
77 ( 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
1310 )
1411 where
1512
@@ -21,52 +18,31 @@ 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
35−import qualified Data.UUID.V4 as UUID.V4
36−#endif
37−#ifdef BACKEND
38−import Data.OpenApi
39−import Test.QuickCheck
40−#ifdef USE_CASSAVA
41−import Data.Csv as Csv hiding(Name)
42−#endif
43−#ifdef USE_POSTGRES
24+import Data.UUID (UUID)
25+import qualified Data.UUID as UUID
26+#ifndef ghcjs_HOST_OS
4427import Database.PostgreSQL.Simple.FromField as PG (FromField)
4528import Database.PostgreSQL.Simple.ToField as PG (ToField)
29+import Data.Csv as Csv hiding(Name)
4630#endif
47−#endif
48−
49−#ifdef USE_FLAT
5031import Flat as F
51−#endif
52−#ifdef USE_STORE
53−import qualified Data.Store
54−#endif
32+import GHC.TypeLits
33+import Test.QuickCheck
34+import Web.HttpApiData
35+import Web.PathPieces (PathPiece(..))
5536
5637newtype Id t = Id { unId :: UUID }
5738 deriving stock Data
5839 deriving newtype
5940 ( Eq, Ord, Binary
6041#ifndef ghcjs_HOST_OS
61−#ifdef USE_POSTGRES
6242 , PG.ToField, PG.FromField
6343#endif
64−#endif
65− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
66−#ifdef BACKEND
67− , ToSchema, ToParamSchema
68−#endif
69− , FromHttpApiData, ToHttpApiData )
44+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
45+ , ToParamSchema, FromHttpApiData, ToHttpApiData )
7046
7147type role Id nominal
7248
@@ -76,42 +52,20 @@ mkId :: forall s. UUID -> Id s
7652mkId = coerce
7753{-# INLINE mkId #-}
7854
79−#ifdef USE_UUID
80−randomId :: forall s. IO (Id s)
81−randomId = coerce <$> UUID.V4.nextRandom
82−{-# INLINE randomId #-}
83−#endif
84−
8555instance KnownSymbol s => Show (Id s) where
86− show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
87−
88−instance KnownSymbol s => Read (Id s) where
89− readsPrec _ = readP_to_S $ do
90− _ <- string ("Id-" <> symbolVal (Proxy @s) <> "-")
91− mkId <$> readS_to_P reads
56+ show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> show v
9257
93−#ifdef USE_FLAT
9458instance Flat (Id s) where
9559 encode = F.encode . UUID.toWords . coerce
9660 decode = coerce . (\(a,b,c,d) -> UUID.fromWords a b c d) <$> F.decode
9761 size = F.size . UUID.toWords . coerce
98−#endif
99−
100−#ifdef USE_STORE
101−instance Data.Store.Store (Id s) where
102− poke = Data.Store.poke . UUID.toWords . coerce
103− peek = coerce . (\(a,b,c,d) -> UUID.fromWords a b c d) <$> Data.Store.peek
104− size = Data.Store.ConstSize 16
105−#endif
10662
107−#ifdef BACKEND
10863instance Arbitrary (Id t) where
10964 arbitrary = fmap Id $ UUID.fromWords
11065 <$> arbitrary
11166 <*> arbitrary
11267 <*> arbitrary
11368 <*> arbitrary
114−#endif
11569
11670instance PathPiece (Id t) where
11771 fromPathPiece = coerce . UUID.fromText
@@ -119,14 +73,12 @@ instance PathPiece (Id t) where
11973
12074#ifndef ghcjs_HOST_OS
12175
122−#ifdef USE_CASSAVA
12376instance Csv.FromField (Id tag) where
12477 parseField = parseField
12578 >=> fmap mkId . maybe (fail "invalid UUID in CSV") pure . UUID.fromText
12679
12780instance Csv.ToField (Id tag) where
12881 toField = Csv.toField . UUID.toText . coerce
129−#endif
13082
13183#endif
13284
@@ -153,24 +105,11 @@ newtype IntId t = IntId { unIntId :: Integer }
153105 deriving newtype
154106 ( Eq, Ord, Binary
155107#ifndef ghcjs_HOST_OS
156−#ifdef USE_POSTGRES
157− , PG.ToField, PG.FromField
158−#endif
159−#ifdef USE_CASSAVA
160− , Csv.ToField, Csv.FromField
161−#endif
162−#endif
163−#ifdef USE_FLAT
164− , Flat
108+ , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
165109#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 )
110+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
111+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat, Arbitrary
112+ , Num, Integral, Real, Enum )
174113
175114type role IntId nominal
176115
@@ -181,12 +120,7 @@ mkIntId = coerce
181120{-# INLINE mkIntId #-}
182121
183122instance KnownSymbol s => Show (IntId s) where
184− show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> P.show v
185−
186−instance KnownSymbol s => Read (IntId s) where
187− readsPrec _ = readP_to_S $ do
188− _ <- string ("IntId-" <> symbolVal (Proxy @s) <> "-")
189− mkIntId <$> readS_to_P reads
123+ show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> show v
190124
191125-- | This is a more \"explicit\" 'coerce' specifically for 'IntId'.
192126-- You are forced to explicitly specify the phantom types you are converting
@@ -204,24 +138,11 @@ newtype Name t = Name { unName :: Text }
204138 deriving newtype
205139 ( Eq, Ord, Binary
206140#ifndef ghcjs_HOST_OS
207−#ifdef USE_POSTGRES
208− , PG.ToField, PG.FromField
209−#endif
210−#ifdef USE_CASSAVA
211− , Csv.ToField, Csv.FromField
212−#endif
141+ , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
213142#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 )
143+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
144+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat
145+ , IsString, Semigroup, Monoid )
225146
226147type role Name nominal
227148
@@ -232,17 +153,10 @@ mkName = coerce
232153{-# INLINE mkName #-}
233154
234155instance KnownSymbol s => Show (Name s) where
235− show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> P.show v
156+ show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> show v
236157
237−instance KnownSymbol s => Read (Name s) where
238− readsPrec _ = readP_to_S $ do
239− _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
240− mkName <$> readS_to_P reads
241−
242−#ifdef BACKEND
243158instance Arbitrary (Name s) where
244159 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
245−#endif
246160
247161-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
248162-- You are forced to explicitly specify the phantom types you are converting