@@ -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,52 +18,33 @@ 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
40−#ifdef USE_CASSAVA
41−import Data.Csv as Csv hiding(Name)
42−#endif
43−#ifdef USE_POSTGRES
27+#ifndef ghcjs_HOST_OS
4428import Database.PostgreSQL.Simple.FromField as PG (FromField)
4529import Database.PostgreSQL.Simple.ToField as PG (ToField)
30+import Data.Csv as Csv hiding(Name)
4631#endif
47−#endif
48−
49−#ifdef USE_FLAT
5032import Flat as F
51−#endif
52−#ifdef USE_STORE
53−import qualified Data.Store
54−#endif
33+import GHC.TypeLits
34+import Test.QuickCheck
35+import Text.ParserCombinators.ReadP
36+import Web.HttpApiData
37+import Web.PathPieces (PathPiece(..))
5538
5639newtype Id t = Id { unId :: UUID }
5740 deriving stock Data
5841 deriving newtype
5942 ( Eq, Ord, Binary
6043#ifndef ghcjs_HOST_OS
61−#ifdef USE_POSTGRES
6244 , PG.ToField, PG.FromField
6345#endif
64−#endif
65− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
66−#ifdef BACKEND
67− , ToSchema, ToParamSchema
68−#endif
69− , FromHttpApiData, ToHttpApiData )
46+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
47+ , ToParamSchema, FromHttpApiData, ToHttpApiData )
7048
7149type role Id nominal
7250
@@ -76,42 +54,29 @@ mkId :: forall s. UUID -> Id s
7654mkId = coerce
7755{-# INLINE mkId #-}
7856
79−#ifdef USE_UUID
8057randomId :: forall s. IO (Id s)
8158randomId = coerce <$> UUID.V4.nextRandom
8259{-# INLINE randomId #-}
83−#endif
8460
8561instance KnownSymbol s => Show (Id s) where
86− show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
62+ show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> show v
8763
8864instance KnownSymbol s => Read (Id s) where
8965 readsPrec _ = readP_to_S $ do
9066 _ <- string ("Id-" <> symbolVal (Proxy @s) <> "-")
9167 mkId <$> readS_to_P reads
9268
93−#ifdef USE_FLAT
9469instance Flat (Id s) where
9570 encode = F.encode . UUID.toWords . coerce
9671 decode = coerce . (\(a,b,c,d) -> UUID.fromWords a b c d) <$> F.decode
9772 size = F.size . UUID.toWords . coerce
98−#endif
9973
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
106−
107−#ifdef BACKEND
10874instance Arbitrary (Id t) where
10975 arbitrary = fmap Id $ UUID.fromWords
11076 <$> arbitrary
11177 <*> arbitrary
11278 <*> arbitrary
11379 <*> arbitrary
114−#endif
11580
11681instance PathPiece (Id t) where
11782 fromPathPiece = coerce . UUID.fromText
@@ -119,14 +84,12 @@ instance PathPiece (Id t) where
11984
12085#ifndef ghcjs_HOST_OS
12186
122−#ifdef USE_CASSAVA
12387instance Csv.FromField (Id tag) where
12488 parseField = parseField
12589 >=> fmap mkId . maybe (fail "invalid UUID in CSV") pure . UUID.fromText
12690
12791instance Csv.ToField (Id tag) where
12892 toField = Csv.toField . UUID.toText . coerce
129−#endif
13093
13194#endif
13295
@@ -153,24 +116,11 @@ newtype IntId t = IntId { unIntId :: Integer }
153116 deriving newtype
154117 ( Eq, Ord, Binary
155118#ifndef ghcjs_HOST_OS
156−#ifdef USE_POSTGRES
157− , PG.ToField, PG.FromField
158−#endif
159−#ifdef USE_CASSAVA
160− , Csv.ToField, Csv.FromField
119+ , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
161120#endif
162−#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 )
121+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
122+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat, Arbitrary
123+ , Num, Integral, Real, Enum )
174124
175125type role IntId nominal
176126
@@ -181,7 +131,7 @@ mkIntId = coerce
181131{-# INLINE mkIntId #-}
182132
183133instance KnownSymbol s => Show (IntId s) where
184− show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> P.show v
134+ show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> show v
185135
186136instance KnownSymbol s => Read (IntId s) where
187137 readsPrec _ = readP_to_S $ do
@@ -204,24 +154,11 @@ newtype Name t = Name { unName :: Text }
204154 deriving newtype
205155 ( Eq, Ord, Binary
206156#ifndef ghcjs_HOST_OS
207−#ifdef USE_POSTGRES
208− , PG.ToField, PG.FromField
209−#endif
210−#ifdef USE_CASSAVA
211− , Csv.ToField, Csv.FromField
157+ , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
212158#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
223− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
224− , ToHttpApiData, PathPiece, IsString, Semigroup, Monoid )
159+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
160+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat
161+ , IsString, Semigroup, Monoid )
225162
226163type role Name nominal
227164
@@ -232,17 +169,15 @@ mkName = coerce
232169{-# INLINE mkName #-}
233170
234171instance KnownSymbol s => Show (Name s) where
235− show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> P.show v
172+ show (Name v) = "Name-" <> symbolVal (Proxy @s) <> "-" <> show v
236173
237174instance KnownSymbol s => Read (Name s) where
238175 readsPrec _ = readP_to_S $ do
239176 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
240177 mkName <$> readS_to_P reads
241178
242−#ifdef BACKEND
243179instance Arbitrary (Name s) where
244180 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
245−#endif
246181
247182-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
248183-- You are forced to explicitly specify the phantom types you are converting