Finish PR 44 - Remove Nested Tuple usage

CHANGELOG.md

@@ -11,6 +11,7 @@ New features:
 Bugfixes:
 
 Other improvements:
+- Remove ending space in css output (e.g. `padding: 1 2 3 4 `) (#135 by @chexxor and @JordanMartinez)
 
 ## [v5.0.1](https://github.com/purescript-contrib/purescript-css/releases/tag/v5.0.1) - 2021-04-19
 

src/CSS/Animation.purs

@@ -7,7 +7,7 @@ import CSS.Stylesheet (CSS, key)
 import CSS.Time (Time)
 import CSS.Transition (TimingFunction)
 import Data.Foldable (for_)
-import Data.Tuple.Nested (tuple7)
+import Data.Tuple (Tuple(..))
 
 newtype AnimationDirection = AnimationDirection Value
 
@@ -60,7 +60,7 @@ backwards = FillMode $ fromString "backwards"
 animation :: AnimationName -> Time -> TimingFunction -> Time -> IterationCount -> AnimationDirection -> FillMode -> CSS
 animation p de f du i di fm = do
   for_ animationKeys \k ->
-    key (fromString k) (tuple7 p de f du i di fm)
+    key (fromString k) (Tuple (Tuple (Tuple p de) (Tuple f du)) (Tuple (Tuple i di) fm))
   where
   animationKeys =
     [ "animation"

src/CSS/Border.purs

@@ -2,13 +2,12 @@ module CSS.Border where
 
 import Prelude
 
-import Data.Tuple.Nested (tuple3, tuple4)
-
 import CSS.Color (Color)
 import CSS.Property (class Val, Value)
 import CSS.Size (Size, Abs)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
+import Data.Tuple (Tuple(..))
 
 newtype Stroke = Stroke Value
 
@@ -46,25 +45,25 @@ outset :: Stroke
 outset = Stroke $ fromString "outset"
 
 border :: Stroke -> Size Abs -> Color -> CSS
-border a b c = key (fromString "border") $ tuple3 a b c
+border a b c = key (fromString "border") (Tuple a (Tuple b c))
 
 borderTop :: Stroke -> Size Abs -> Color -> CSS
-borderTop a b c = key (fromString "border-top") $ tuple3 a b c
+borderTop a b c = key (fromString "border-top") (Tuple a (Tuple b c))
 
 borderBottom :: Stroke -> Size Abs -> Color -> CSS
-borderBottom a b c = key (fromString "border-bottom") $ tuple3 a b c
+borderBottom a b c = key (fromString "border-bottom") (Tuple a (Tuple b c))
 
 borderLeft :: Stroke -> Size Abs -> Color -> CSS
-borderLeft a b c = key (fromString "border-left") $ tuple3 a b c
+borderLeft a b c = key (fromString "border-left") (Tuple a (Tuple b c))
 
 borderRight :: Stroke -> Size Abs -> Color -> CSS
-borderRight a b c = key (fromString "border-right") $ tuple3 a b c
+borderRight a b c = key (fromString "border-right") (Tuple a (Tuple b c))
 
 borderColor :: Color -> CSS
 borderColor = key $ fromString "border-color"
 
 borderRadius :: forall a. Size a -> Size a -> Size a -> Size a -> CSS
-borderRadius a b c d = key (fromString "border-radius") (tuple4 a b c d)
+borderRadius a b c d = key (fromString "border-radius") (Tuple (Tuple a b) (Tuple c d))
 
 borderSpacing :: forall a. Size a -> CSS
 borderSpacing = key $ fromString "border-spacing"

src/CSS/Geometry.purs

@@ -1,11 +1,10 @@
 module CSS.Geometry where
 
-import Data.Function (($))
-import Data.Tuple.Nested (tuple4)
-
 import CSS.Size (Size)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
+import Data.Function (($))
+import Data.Tuple (Tuple(..))
 
 width :: forall a. Size a -> CSS
 width = key $ fromString "width"
@@ -38,7 +37,7 @@ right :: forall a. Size a -> CSS
 right = key $ fromString "right"
 
 padding :: forall a. Size a -> Size a -> Size a -> Size a -> CSS
-padding a b c d = key (fromString "padding") $ tuple4 a b c d
+padding a b c d = key (fromString "padding") (Tuple (Tuple a b) (Tuple c d))
 
 paddingTop :: forall a. Size a -> CSS
 paddingTop = key $ fromString "padding-top"
@@ -53,7 +52,7 @@ paddingRight :: forall a. Size a -> CSS
 paddingRight = key $ fromString "padding-right"
 
 margin :: forall a. Size a -> Size a -> Size a -> Size a -> CSS
-margin a b c d = key (fromString "margin") $ tuple4 a b c d
+margin a b c d = key (fromString "margin") (Tuple (Tuple a b) (Tuple c d))
 
 marginTop :: forall a. Size a -> CSS
 marginTop = key $ fromString "margin-top"

src/CSS/ListStyle.purs

@@ -6,12 +6,12 @@ import CSS.ListStyle.Type (ListStyleType)
 import CSS.Property (class Val, value)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
-import Data.Tuple.Nested (tuple3)
+import Data.Tuple (Tuple(..))
 
 data ListStyle = ListStyle ListStyleType ListStylePosition ListStyleImage
 
 instance valueListStyle :: Val ListStyle where
-  value (ListStyle t p i) = value (tuple3 t p i)
+  value (ListStyle t p i) = value (Tuple t (Tuple p i))
 
 listStyle :: ListStyleType -> ListStylePosition -> ListStyleImage -> CSS
 listStyle t p i = key (fromString "list-style") (ListStyle t p i)

src/CSS/Property.purs

@@ -85,8 +85,6 @@ instance valString :: Val String where
 instance valUnit :: Val Unit where
   value _ = fromString ""
 
--- When `b` is Unit, the rendered value will have an extra
---   space appended to end. Shouldn't hurt. I'd fix if I knew how.
 instance valTuple :: (Val a, Val b) => Val (Tuple a b) where
   value (Tuple a b) = value a <> fromString " " <> value b
 

src/CSS/Text/Shadow.purs

@@ -6,7 +6,7 @@ import CSS.Property (class Val, value)
 import CSS.Size (Size)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
-import Data.Tuple.Nested (tuple4)
+import Data.Tuple (Tuple(..))
 
 data TextShadow :: Type -> Type
 data TextShadow a
@@ -16,7 +16,7 @@ data TextShadow a
   | Inherit
 
 instance valTextShadow :: Val (TextShadow a) where
-  value (TextShadow h v b c) = value (tuple4 h v b c)
+  value (TextShadow h v b c) = value (Tuple (Tuple h v) (Tuple b c))
   value (None) = fromString "none"
   value (Initial) = fromString "initial"
   value (Inherit) = fromString "inherit"

src/CSS/Transform.purs

@@ -6,7 +6,7 @@ import CSS.Property (class Val, Value, noCommas, value)
 import CSS.Size (Angle, Size)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
-import Data.Tuple.Nested (tuple3)
+import Data.Tuple (Tuple(..))
 
 newtype Transformation = Transformation Value
 
@@ -124,7 +124,7 @@ instance valTransformOriginOffset :: Val (TransformOriginOffset a) where
   value (OffsetCenter) = fromString "center"
 
 instance valTransformOrigin :: Val (TransformOrigin a) where
-  value (TransformOrigin x y z) = value (tuple3 x y z)
+  value (TransformOrigin x y z) = value (Tuple (Tuple x y) z)
   value (Initial) = fromString "initial"
   value (Inherit) = fromString "inherit"
   value (Unset) = fromString "unset"

test/Main.purs

@@ -162,7 +162,7 @@ main :: Effect Unit
 main = do
   renderedInline example1 `assertEqual` Just "color: hsl(0.0, 100.0%, 50.0%); display: block"
   renderedInline example2 `assertEqual` Just "display: inline-block"
-  renderedInline example3 `assertEqual` Just "border: dashed 2.0px hsl(240.0, 100.0%, 50.0%) "
+  renderedInline example3 `assertEqual` Just "border: dashed 2.0px hsl(240.0, 100.0%, 50.0%)"
 
   selector (Selector (Refinement [Id "test"]) Star) `assertEqual` "#test"