refactor tags

Author: functora

pub/functora/src/money/Functora/Money.hs

@@ -47,7 +47,7 @@ import Functora.Prelude
 import Functora.Tags as X
 import qualified Language.Haskell.TH.Syntax as TH
 
-type IntRep tags = NewIntRep (GetKey SignedOrUnsigned tags)
+type IntRep tags = NewIntRep (GetTag SignedOrUnsigned tags)
 
 type family NewIntRep sig where
   NewIntRep 'Signed = Integer
@@ -297,7 +297,7 @@ unJsonRational = toRational <$> A.scientific
 unJsonMoney ::
   forall tags (sig :: SignedOrUnsigned).
   ( MoneyTags tags,
-    GetTag sig tags
+    HasTag sig tags
   ) =>
   A.Decoder (Money tags)
 unJsonMoney = do

pub/functora/src/sql/Functora/SqlOrphan.hs

@@ -76,13 +76,13 @@ deriving via
   Rational
   instance
     ( MoneyTags tags,
-      GetTag (sig :: SignedOrUnsigned) tags
+      HasTag (sig :: SignedOrUnsigned) tags
     ) =>
     PersistFieldSql (Money tags)
 
 instance
   ( MoneyTags tags,
-    GetTag (sig :: SignedOrUnsigned) tags
+    HasTag (sig :: SignedOrUnsigned) tags
   ) =>
   PersistField (Money tags)
   where

pub/functora/src/tags/Functora/TagsFamily.hs

@@ -13,7 +13,7 @@ module Functora.TagsFamily
     -- * Accessors
     -- $accessors
     GetTag,
-    GetKey,
+    HasTag,
 
     -- * Fingerprints
     -- $fingerprints
@@ -69,12 +69,15 @@ type family lhs |&| rhs where
 -- $accessors
 -- Accessors
 
-type GetTag (v :: k) tags =
-  ( v ~ GetTagFamily ('Nothing :: Maybe k) k tags tags,
-    SingI v
-  )
+type GetTag k tags = GetTagFamily ('Nothing :: Maybe k) k tags tags
 
-type GetKey k tags = GetTagFamily ('Nothing :: Maybe k) k tags tags
+type HasTag (v :: k) tags =
+  ( SingI v,
+    Typeable v,
+    Typeable k,
+    Typeable tags,
+    v ~ GetTag k tags
+  )
 
 -- $fingerprints
 -- Fingerprints

pub/functora/test/Functora/TagsSpec.hs

@@ -14,7 +14,7 @@ newMoney = Tagged $ 4 % 5
 
 getSymbolTag ::
   forall (tag :: Symbol) tags rep.
-  ( GetTag tag tags
+  ( HasTag tag tags
   ) =>
   Tagged tags rep ->
   Demote Symbol
@@ -23,7 +23,7 @@ getSymbolTag _ =
 
 getGainOrLoseTag ::
   forall (tag :: GainOrLose) tags rep.
-  ( GetTag tag tags
+  ( HasTag tag tags
   ) =>
   Tagged tags rep ->
   GainOrLose