@@ -7,9 +7,6 @@ module Data.Id
7 ( Id, mkId, unId, 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
@@ -21,52 +18,31 @@ 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
28−import GHC.TypeLits
26+#ifndef ghcjs_HOST_OS
30−import Text.ParserCombinators.ReadP
31−import Web.HttpApiData
32−import Web.PathPieces (PathPiece(..))
35−import qualified Data.UUID.V4 as UUID.V4
39−import Test.QuickCheck
41−import Data.Csv as Csv hiding(Name)
44import Database.PostgreSQL.Simple.FromField as PG (FromField)
27import Database.PostgreSQL.Simple.FromField as PG (FromField)
45import Database.PostgreSQL.Simple.ToField as PG (ToField)
28import Database.PostgreSQL.Simple.ToField as PG (ToField)
29+import Data.Csv as Csv hiding(Name)
50import Flat as F
31import Flat as F
51−#endif
32+import GHC.TypeLits
52−#ifdef USE_STORE
33+import Test.QuickCheck
53−import qualified Data.Store
34+import Web.HttpApiData
54−#endif
35+import Web.PathPieces (PathPiece(..))
56newtype Id t = Id { unId :: UUID }
37newtype Id t = Id { unId :: UUID }
57 deriving stock Data
38 deriving stock Data
58 deriving newtype
39 deriving newtype
59 ( Eq, Ord, Binary
40 ( Eq, Ord, Binary
60#ifndef ghcjs_HOST_OS
41#ifndef ghcjs_HOST_OS
62 , PG.ToField, PG.FromField
42 , PG.ToField, PG.FromField
65− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey
44+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
67− , ToSchema, ToParamSchema
69− , FromHttpApiData, ToHttpApiData )
45+ , ToParamSchema, FromHttpApiData, ToHttpApiData )
71type role Id nominal
47type role Id nominal
@@ -76,42 +52,20 @@ mkId :: forall s. UUID -> Id s
76mkId = coerce
52mkId = coerce
77{-# INLINE mkId #-}
53{-# INLINE mkId #-}
80−randomId :: forall s. IO (Id s)
81−randomId = coerce <$> UUID.V4.nextRandom
82−{-# INLINE randomId #-}
85instance KnownSymbol s => Show (Id s) where
55instance KnownSymbol s => Show (Id s) where
86− show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> P.show v
56+ show (Id v) = "Id-" <> symbolVal (Proxy @s) <> "-" <> show v
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
94instance Flat (Id s) where
58instance Flat (Id s) where
95 encode = F.encode . UUID.toWords . coerce
59 encode = F.encode . UUID.toWords . coerce
96 decode = coerce . (\(a,b,c,d) -> UUID.fromWords a b c d) <$> F.decode
60 decode = coerce . (\(a,b,c,d) -> UUID.fromWords a b c d) <$> F.decode
97 size = F.size . UUID.toWords . coerce
61 size = F.size . UUID.toWords . coerce
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
108instance Arbitrary (Id t) where
63instance Arbitrary (Id t) where
109 arbitrary = fmap Id $ UUID.fromWords
64 arbitrary = fmap Id $ UUID.fromWords
110 <$> arbitrary
65 <$> arbitrary
111 <*> arbitrary
66 <*> arbitrary
112 <*> arbitrary
67 <*> arbitrary
113 <*> arbitrary
68 <*> arbitrary
116instance PathPiece (Id t) where
70instance PathPiece (Id t) where
117 fromPathPiece = coerce . UUID.fromText
71 fromPathPiece = coerce . UUID.fromText
@@ -119,14 +73,12 @@ instance PathPiece (Id t) where
120#ifndef ghcjs_HOST_OS
74#ifndef ghcjs_HOST_OS
123instance Csv.FromField (Id tag) where
76instance Csv.FromField (Id tag) where
124 parseField = parseField
77 parseField = parseField
125 >=> fmap mkId . maybe (fail "invalid UUID in CSV") pure . UUID.fromText
78 >=> fmap mkId . maybe (fail "invalid UUID in CSV") pure . UUID.fromText
127instance Csv.ToField (Id tag) where
80instance Csv.ToField (Id tag) where
128 toField = Csv.toField . UUID.toText . coerce
81 toField = Csv.toField . UUID.toText . coerce
@@ -153,24 +105,11 @@ newtype IntId t = IntId { unIntId :: Integer }
153 deriving newtype
105 deriving newtype
154 ( Eq, Ord, Binary
106 ( Eq, Ord, Binary
155#ifndef ghcjs_HOST_OS
107#ifndef ghcjs_HOST_OS
157− , PG.ToField, PG.FromField
160− , Csv.ToField, Csv.FromField
108+ , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
170− , ToSchema, ToParamSchema, Arbitrary
172− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
110+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
111+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat, Arbitrary
173− , ToHttpApiData, PathPiece, Num, Integral, Real, Enum )
112+ , Num, Integral, Real, Enum )
175type role IntId nominal
114type role IntId nominal
@@ -181,12 +120,7 @@ mkIntId = coerce
181{-# INLINE mkIntId #-}
120{-# INLINE mkIntId #-}
183instance KnownSymbol s => Show (IntId s) where
122instance KnownSymbol s => Show (IntId s) where
184− show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> P.show v
123+ show (IntId v) = "IntId-" <> symbolVal (Proxy @s) <> "-" <> show v
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
191-- | This is a more \"explicit\" 'coerce' specifically for 'IntId'.
125-- | This is a more \"explicit\" 'coerce' specifically for 'IntId'.
192-- You are forced to explicitly specify the phantom types you are converting
126-- You are forced to explicitly specify the phantom types you are converting
@@ -204,24 +138,11 @@ newtype Name t = Name { unName :: Text }
204 deriving newtype
138 deriving newtype
205 ( Eq, Ord, Binary
139 ( Eq, Ord, Binary
206#ifndef ghcjs_HOST_OS
140#ifndef ghcjs_HOST_OS
208− , PG.ToField, PG.FromField
211− , Csv.ToField, Csv.FromField
141+ , PG.ToField, PG.FromField, Csv.ToField, Csv.FromField
221− , ToSchema, ToParamSchema
223− , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, FromHttpApiData
143+ , FromJSON, ToJSON, NFData, Hashable, FromJSONKey, ToJSONKey, ToSchema
144+ , ToParamSchema, FromHttpApiData, ToHttpApiData, PathPiece, Flat
224− , ToHttpApiData, PathPiece, IsString, Semigroup, Monoid )
145+ , IsString, Semigroup, Monoid )
226type role Name nominal
147type role Name nominal
@@ -232,17 +153,10 @@ mkName = coerce
232{-# INLINE mkName #-}
153{-# INLINE mkName #-}
234instance KnownSymbol s => Show (Name s) where
155instance 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
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
243instance Arbitrary (Name s) where
158instance Arbitrary (Name s) where
244 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
159 arbitrary = coerce . T.pack . getPrintableString <$> arbitrary
247-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
161-- | This is a more \"explicit\" 'coerce' specifically for 'Name'.
248-- You are forced to explicitly specify the phantom types you are converting
162-- You are forced to explicitly specify the phantom types you are converting