@@ -4,9 +4,12 @@
4{-# OPTIONS_GHC -Wno-orphans #-}
4{-# OPTIONS_GHC -Wno-orphans #-}
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
@@ -18,13 +21,22 @@ 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)
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
30+import Text.ParserCombinators.ReadP
31+import Web.HttpApiData
32+import Web.PathPieces (PathPiece(..))
26import qualified Data.UUID.V4 as UUID.V4
35import qualified Data.UUID.V4 as UUID.V4
27−#ifndef ghcjs_HOST_OS
36+#endif
39+import Test.QuickCheck
28#ifdef USE_CASSAVA
40#ifdef USE_CASSAVA
29import Data.Csv as Csv hiding(Name)
41import Data.Csv as Csv hiding(Name)
@@ -33,12 +45,7 @@ import Database.PostgreSQL.Simple.FromField as PG (FromField)
33import Database.PostgreSQL.Simple.ToField as PG (ToField)
45import Database.PostgreSQL.Simple.ToField as PG (ToField)
36−import GHC.TypeLits
48+
38−import Test.QuickCheck
39−import Text.ParserCombinators.ReadP
40−import Web.HttpApiData
41−import Web.PathPieces (PathPiece(..))
42#ifdef USE_FLAT
49#ifdef USE_FLAT
43import Flat as F
50import Flat as F
@@ -55,8 +62,11 @@ newtype Id t = Id { unId :: UUID }
55 , PG.ToField, PG.FromField
62 , PG.ToField, PG.FromField
58− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
65+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
67+ , ToSchema, ToParamSchema
59− , ToParamSchema, FromHttpApiData, ToHttpApiData )
69+ , FromHttpApiData, ToHttpApiData )
61type role Id nominal
71type role Id nominal
@@ -66,9 +76,11 @@ mkId :: forall s. UUID -> Id s
66mkId = coerce
76mkId = coerce
67{-# INLINE mkId #-}
77{-# INLINE mkId #-}
69randomId :: forall s. IO (Id s)
80randomId :: forall s. IO (Id s)
70randomId = coerce <$> UUID.V4.nextRandom
81randomId = coerce <$> UUID.V4.nextRandom
71{-# INLINE randomId #-}
82{-# INLINE randomId #-}
73instance KnownSymbol s => Show (Id s) where
85instance KnownSymbol s => Show (Id s) where
74 show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
86 show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
@@ -92,12 +104,14 @@ instance Data.Store.Store (Id s) where
92 size = Data.Store.ConstSize 16
104 size = Data.Store.ConstSize 16
95instance Arbitrary (Id t) where
108instance Arbitrary (Id t) where
96 arbitrary = fmap Id $ UUID.fromWords
109 arbitrary = fmap Id $ UUID.fromWords
97 <$> arbitrary
110 <$> arbitrary
98 <*> arbitrary
111 <*> arbitrary
99 <*> arbitrary
112 <*> arbitrary
100 <*> arbitrary
113 <*> arbitrary
102instance PathPiece (Id t) where
116instance PathPiece (Id t) where
103 fromPathPiece = coerce . UUID.fromText
117 fromPathPiece = coerce . UUID.fromText
@@ -152,9 +166,11 @@ newtype IntId t = IntId { unIntId :: Integer }
152#ifdef USE_STORE
166#ifdef USE_STORE
153 , Data.Store.Store
167 , Data.Store.Store
170+ , ToSchema, ToParamSchema, Arbitrary
155− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
172+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
156− , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Arbitrary
157− , Num, Integral, Real, Enum )
173+ , ToHttpApiData, PathPiece, Num, Integral, Real, Enum )
159type role IntId nominal
175type role IntId nominal
@@ -201,9 +217,11 @@ newtype Name t = Name { unName :: Text }
201#ifdef USE_STORE
217#ifdef USE_STORE
202 , Data.Store.Store
218 , Data.Store.Store
221+ , ToSchema, ToParamSchema
204− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
223+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
205− , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece
206− , IsString, Semigroup, Monoid )
224+ , ToHttpApiData, PathPiece, IsString, Semigroup, Monoid )
208type role Name nominal
226type role Name nominal
@@ -221,8 +239,10 @@ instance KnownSymbol s => Read (Name s) where
221 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
239 _ <- string ("Name-" <> symbolVal (Proxy @s) <> "-")
222 mkName <$> readS_to_P reads
240 mkName <$> readS_to_P reads
224instance Arbitrary (Name s) where
243instance Arbitrary (Name s) where
225 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
244 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
227-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
247-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
228-- 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