@@ -4,12 +4,9 @@
4{-# OPTIONS_GHC -Wno-orphans #-}
4{-# OPTIONS_GHC -Wno-orphans #-}
6module Data.Id
6module Data.Id
7− ( Id, mkId, unId, unsafeIdTagConvert, coerceId, _Id, nilId
7+ ( Id, mkId, unId, randomId, 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
@@ -21,22 +18,13 @@ import Data.Binary (Binary)
21import Data.Coerce (coerce)
18import Data.Coerce (coerce)
22import Data.Data
19import Data.Data
23import Data.Hashable (Hashable)
20import Data.Hashable (Hashable)
24import Data.String
22import Data.String
25import Data.Text as T
23import Data.Text as T
26−import Data.UUID.Types (UUID)
24+import Data.UUID (UUID)
27−import qualified Data.UUID.Types as UUID
25+import qualified Data.UUID as UUID
30−import Text.ParserCombinators.ReadP
31−import Web.HttpApiData
32−import Web.PathPieces (PathPiece(..))
35import qualified Data.UUID.V4 as UUID.V4
26import qualified Data.UUID.V4 as UUID.V4
36−#endif
27+#ifndef ghcjs_HOST_OS
39−import Test.QuickCheck
40#ifdef USE_CASSAVA
28#ifdef USE_CASSAVA
41import Data.Csv as Csv hiding(Name)
29import Data.Csv as Csv hiding(Name)
@@ -45,7 +33,11 @@ import Database.PostgreSQL.Simple.FromField as PG (FromField)
45import Database.PostgreSQL.Simple.ToField as PG (ToField)
33import Database.PostgreSQL.Simple.ToField as PG (ToField)
48−
36+import GHC.TypeLits
37+import Test.QuickCheck
38+import Text.ParserCombinators.ReadP
39+import Web.HttpApiData
40+import Web.PathPieces (PathPiece(..))
49#ifdef USE_FLAT
41#ifdef USE_FLAT
50import Flat as F
42import Flat as F
@@ -62,11 +54,8 @@ newtype Id t = Id { unId :: UUID }
62 , PG.ToField, PG.FromField
54 , PG.ToField, PG.FromField
65− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
57+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
67− , ToSchema, ToParamSchema
69− , FromHttpApiData, ToHttpApiData )
58+ , ToParamSchema, FromHttpApiData, ToHttpApiData )
71type role Id nominal
60type role Id nominal
@@ -76,14 +65,12 @@ mkId :: forall s. UUID -> Id s
76mkId = coerce
65mkId = coerce
77{-# INLINE mkId #-}
66{-# INLINE mkId #-}
80randomId :: forall s. IO (Id s)
68randomId :: forall s. IO (Id s)
81randomId = coerce <$> UUID.V4.nextRandom
69randomId = coerce <$> UUID.V4.nextRandom
82{-# INLINE randomId #-}
70{-# INLINE randomId #-}
85instance KnownSymbol s => Show (Id s) where
72instance 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
88instance KnownSymbol s => Read (Id s) where
75instance KnownSymbol s => Read (Id s) where
89 readsPrec _ = readP_to_S $ do
76 readsPrec _ = readP_to_S $ do
@@ -104,14 +91,12 @@ instance Data.Store.Store (Id s) where
104 size = Data.Store.ConstSize 16
91 size = Data.Store.ConstSize 16
108instance Arbitrary (Id t) where
94instance Arbitrary (Id t) where
109 arbitrary = fmap Id $ UUID.fromWords
95 arbitrary = fmap Id $ UUID.fromWords
110 <$> arbitrary
96 <$> arbitrary
111 <*> arbitrary
97 <*> arbitrary
112 <*> arbitrary
98 <*> arbitrary
113 <*> arbitrary
99 <*> arbitrary
116instance PathPiece (Id t) where
101instance PathPiece (Id t) where
117 fromPathPiece = coerce . UUID.fromText
102 fromPathPiece = coerce . UUID.fromText
@@ -160,17 +145,9 @@ newtype IntId t = IntId { unIntId :: Integer }
160 , Csv.ToField, Csv.FromField
145 , Csv.ToField, Csv.FromField
170− , ToSchema, ToParamSchema, Arbitrary
172− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
148+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
149+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat, Arbitrary
173− , ToHttpApiData, PathPiece, Num, Integral, Real, Enum )
150+ , Num, Integral, Real, Enum )
175type role IntId nominal
152type role IntId nominal
@@ -181,7 +158,7 @@ mkIntId = coerce
181{-# INLINE mkIntId #-}
158{-# INLINE mkIntId #-}
183instance KnownSymbol s => Show (IntId s) where
160instance 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
186instance KnownSymbol s => Read (IntId s) where
163instance KnownSymbol s => Read (IntId s) where
187 readsPrec _ = readP_to_S $ do
164 readsPrec _ = readP_to_S $ do
@@ -211,17 +188,9 @@ newtype Name t = Name { unName :: Text }
211 , Csv.ToField, Csv.FromField
188 , Csv.ToField, Csv.FromField
221− , ToSchema, ToParamSchema
223− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
191+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
192+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat
224− , ToHttpApiData, PathPiece, IsString, Semigroup, Monoid )
193+ , IsString, Semigroup, Monoid )
226type role Name nominal
195type role Name nominal
@@ -232,17 +201,15 @@ mkName = coerce
232{-# INLINE mkName #-}
201{-# INLINE mkName #-}
234instance KnownSymbol s => Show (Name s) where
203instance 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
237instance KnownSymbol s => Read (Name s) where
206instance KnownSymbol s => Read (Name s) where
238 readsPrec _ = readP_to_S $ do
207 readsPrec _ = readP_to_S $ do
239 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
208 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
240 mkName <$> readS_to_P reads
209 mkName <$> readS_to_P reads
243instance Arbitrary (Name s) where
211instance Arbitrary (Name s) where
244 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
212 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
247-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
214-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
248-- You are forced to explicitly specify the phantom types you are converting
215-- You are forced to explicitly specify the phantom types you are converting