@@ -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,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)
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
28import Data.Csv as Csv hiding(Name)
41import Data.Csv as Csv hiding(Name)
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)
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
@@ -52,8 +62,11 @@ newtype Id t = Id { unId :: UUID }
52 , PG.ToField, PG.FromField
62 , PG.ToField, PG.FromField
55− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
65+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
67+ , ToSchema, ToParamSchema
56− , ToParamSchema, FromHttpApiData, ToHttpApiData )
69+ , FromHttpApiData, ToHttpApiData )
58type role Id nominal
71type role Id nominal
@@ -63,12 +76,14 @@ mkId :: forall s. UUID -> Id s
63mkId = coerce
76mkId = coerce
64{-# INLINE mkId #-}
77{-# INLINE mkId #-}
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 #-}
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
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
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
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
103#ifndef ghcjs_HOST_OS
120#ifndef ghcjs_HOST_OS
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
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
@@ -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
138− , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
160+ , Csv.ToField, Csv.FromField
170+ , ToSchema, ToParamSchema, Arbitrary
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 )
145type role IntId nominal
175type role IntId nominal
@@ -151,7 +181,7 @@ mkIntId = coerce
151{-# INLINE mkIntId #-}
181{-# INLINE mkIntId #-}
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
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
178− , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
211+ , Csv.ToField, Csv.FromField
221+ , ToSchema, ToParamSchema
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 )
185type role Name nominal
226type role Name nominal
@@ -191,15 +232,17 @@ mkName = coerce
191{-# INLINE mkName #-}
232{-# INLINE mkName #-}
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
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
201instance Arbitrary (Name s) where
243instance Arbitrary (Name s) where
202 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
244 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
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