Use gShow.

Author: alexmingoia

src/CSS/ListStyle.purs

@@ -3,18 +3,15 @@ module CSS.ListStyle where
 import CSS.ListStyle.Image (ListStyleImage)
 import CSS.ListStyle.Position (ListStylePosition)
 import CSS.ListStyle.Type (ListStyleType)
-import CSS.Property (class Val)
+import CSS.Property (class Val, value)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
-import Data.Function (($))
-import Data.Semigroup ((<>))
-import Data.Show (show)
+import Data.Tuple.Nested (tuple3)
 
 data ListStyle = ListStyle ListStyleType ListStylePosition ListStyleImage
 
 instance valueListStyle :: Val ListStyle where
-  value (ListStyle t p i) =
-    fromString $ (show t) <> " " <> (show p) <> " " <> (show i)
+  value (ListStyle t p i) = value (tuple3 t p i)
 
 listStyle :: ListStyleType -> ListStylePosition -> ListStyleImage -> CSS
 listStyle t p i = key (fromString "list-style") (ListStyle t p i)

src/CSS/ListStyle/Image.purs

@@ -4,9 +4,12 @@ import CSS.Common (class Inherit, class Initial, class None, class Unset, class
 import CSS.Property (class Val)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
+import Data.Eq (class Eq)
 import Data.Function (($))
+import Data.Generic (class Generic, gShow)
+import Data.Ord (class Ord)
 import Data.Semigroup ((<>))
-import Data.Show (class Show, show)
+import Data.Show (class Show)
 
 data ListStyleImage
   = ListStyleImage String
@@ -15,15 +18,19 @@ data ListStyleImage
   | Unset
   | None
 
-instance valListStyleImage :: Val ListStyleImage where
-  value s = fromString (show s)
+derive instance eqListStyleImage :: Eq ListStyleImage
+derive instance ordListStyleImage :: Ord ListStyleImage
+derive instance genericListStyleImage :: Generic ListStyleImage
 
 instance showListStyleImage :: Show ListStyleImage where
-  show (Initial) = "initial"
-  show (Inherit) = "inherit"
-  show (Unset) = "unset"
-  show (None) = "none"
-  show (ListStyleImage url) = ("url('" <> url <> "')")
+  show = gShow
+
+instance valListStyleImage :: Val ListStyleImage where
+  value (Initial) = fromString "initial"
+  value (Inherit) = fromString "inherit"
+  value (Unset) = fromString "unset"
+  value (None) = fromString "none"
+  value (ListStyleImage url) = fromString ("url('" <> url <> "')")
 
 instance initialListStyleImage :: Initial ListStyleImage where
   initial = Initial

src/CSS/ListStyle/Position.purs

@@ -4,8 +4,11 @@ import CSS.Common (class Inherit, class Initial, class Unset)
 import CSS.Property (class Val)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
+import Data.Eq (class Eq)
 import Data.Function (($))
-import Data.Show (class Show, show)
+import Data.Generic (class Generic, gShow)
+import Data.Ord (class Ord)
+import Data.Show (class Show)
 
 data ListStylePosition
   = Inside
@@ -14,15 +17,19 @@ data ListStylePosition
   | Initial
   | Unset
 
-instance valListStylePosition :: Val ListStylePosition where
-  value s = fromString (show s)
+derive instance eqListStylePosition :: Eq ListStylePosition
+derive instance ordListStylePosition :: Ord ListStylePosition
+derive instance genericListStylePosition :: Generic ListStylePosition
 
 instance showListStylePosition :: Show ListStylePosition where
-  show (Inside) = "inside"
-  show (Outside) = "outside"
-  show (Inherit) = "inherit"
-  show (Initial) = "initial"
-  show (Unset) = "unset"
+  show = gShow
+
+instance valListStylePosition :: Val ListStylePosition where
+  value (Inside) = fromString "inside"
+  value (Outside) = fromString "outside"
+  value (Inherit) = fromString "inherit"
+  value (Initial) = fromString "initial"
+  value (Unset) = fromString "unset"
 
 instance initialListStylePosition :: Initial ListStylePosition where
   initial = Initial

src/CSS/ListStyle/Type.purs

@@ -4,9 +4,12 @@ import CSS.Common (class Inherit, class Initial, class None, class Unset)
 import CSS.Property (class Val)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
+import Data.Eq (class Eq)
 import Data.Function (($))
+import Data.Generic (class Generic, gShow)
+import Data.Ord (class Ord)
 import Data.Semigroup ((<>))
-import Data.Show (class Show, show)
+import Data.Show (class Show)
 
 data ListStyleType
   = Disc
@@ -23,23 +26,27 @@ data ListStyleType
   | CustomStyleType String
   | StringStyleType String
 
-instance valListStyleType :: Val ListStyleType where
-  value s = fromString (show s)
+derive instance eqListStyleType :: Eq ListStyleType
+derive instance ordListStyleType :: Ord ListStyleType
+derive instance genericListStyleType :: Generic ListStyleType
 
 instance showListStyleType :: Show ListStyleType where
-  show (Disc) = "disc"
-  show (Circle) = "circle"
-  show (Square) = "square"
-  show (Decimal) = "decimal"
-  show (Georgian) = "georgian"
-  show (CJKIdeographic) = "cjk-ideographic"
-  show (Kannada) = "kannada"
-  show (None) = "none"
-  show (Initial) = "initial"
-  show (Inherit) = "inherit"
-  show (Unset) = "unset"
-  show (CustomStyleType s) = ("custom-" <> s)
-  show (StringStyleType s) = s
+  show = gShow
+
+instance valListStyleType :: Val ListStyleType where
+  value (Disc) = fromString "disc"
+  value (Circle) = fromString "circle"
+  value (Square) = fromString "square"
+  value (Decimal) = fromString "decimal"
+  value (Georgian) = fromString "georgian"
+  value (CJKIdeographic) = fromString "cjk-ideographic"
+  value (Kannada) = fromString "kannada"
+  value (None) = fromString "none"
+  value (Initial) = fromString "initial"
+  value (Inherit) = fromString "inherit"
+  value (Unset) = fromString "unset"
+  value (CustomStyleType s) = fromString ("custom-" <> s)
+  value (StringStyleType s) = fromString s
 
 instance initialListStyleType :: Initial ListStyleType where
   initial = Initial