From 5c9ea29f3e4d093e79b490bd39fe8c616f940960 Mon Sep 17 00:00:00 2001 From: Vasiliy Yorkin Date: Wed, 2 May 2018 18:29:13 +0300 Subject: [PATCH] Remove purescript-generics, upgrade dependencies --- .gitignore | 1 + src/CSS/Animation.purs | 5 ----- src/CSS/Background.purs | 11 ----------- src/CSS/Border.purs | 2 -- src/CSS/Box.purs | 3 --- src/CSS/Display.purs | 18 ++++++++++-------- src/CSS/Flexbox.purs | 8 -------- src/CSS/Font.purs | 4 ---- src/CSS/FontFace.purs | 3 --- src/CSS/Gradient.purs | 3 --- src/CSS/ListStyle/Image.purs | 11 ++++++----- src/CSS/ListStyle/Position.purs | 9 +++++---- src/CSS/ListStyle/Type.purs | 19 ++++++++++++++----- src/CSS/Overflow.purs | 3 --- src/CSS/Property.purs | 5 ----- src/CSS/Render.purs | 3 --- src/CSS/Selector.purs | 5 ----- src/CSS/Size.purs | 4 ---- src/CSS/Stylesheet.purs | 8 -------- src/CSS/Text.purs | 2 -- src/CSS/Text/Transform.purs | 10 ++++++---- src/CSS/Text/Whitespace.purs | 3 --- src/CSS/TextAlign.purs | 3 --- src/CSS/Time.purs | 3 --- src/CSS/Transform.purs | 2 -- src/CSS/Transition.purs | 3 --- 26 files changed, 42 insertions(+), 109 deletions(-) diff --git a/.gitignore b/.gitignore index b4cddd3..ee49eba 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /node_modules/ /output/ site/psc.js +package-lock.json diff --git a/src/CSS/Animation.purs b/src/CSS/Animation.purs index b774508..3804225 100644 --- a/src/CSS/Animation.purs +++ b/src/CSS/Animation.purs @@ -7,14 +7,12 @@ import CSS.Stylesheet (CSS, key) import CSS.Time (Time) import CSS.Transition (TimingFunction) import Data.Foldable (for_) -import Data.Generic.Rep (class Generic) import Data.Tuple.Nested (tuple7) newtype AnimationDirection = AnimationDirection Value derive instance eqAnimationDirection :: Eq AnimationDirection derive instance ordAnimationDirection :: Ord AnimationDirection -derive instance genericAnimationDirection :: Generic AnimationDirection _ instance valAnimationDirection :: Val AnimationDirection where value (AnimationDirection v) = v @@ -35,7 +33,6 @@ newtype IterationCount = IterationCount Value derive instance eqIterationCount :: Eq IterationCount derive instance ordIterationCount :: Ord IterationCount -derive instance genericIterationCount :: Generic IterationCount _ instance valIterationCount :: Val IterationCount where value (IterationCount v) = v @@ -50,7 +47,6 @@ newtype FillMode = FillMode Value derive instance eqFillMode :: Eq FillMode derive instance ordFillMode :: Ord FillMode -derive instance genericFillMode :: Generic FillMode _ instance valFillMode :: Val FillMode where value (FillMode v) = v @@ -77,7 +73,6 @@ newtype AnimationName = AnimationName Value derive instance eqAnimationName :: Eq AnimationName derive instance ordAnimationName :: Ord AnimationName -derive instance genericAnimationName :: Generic AnimationName _ instance valAnimationName :: Val AnimationName where value (AnimationName v) = v diff --git a/src/CSS/Background.purs b/src/CSS/Background.purs index 8df18de..b21aea7 100644 --- a/src/CSS/Background.purs +++ b/src/CSS/Background.purs @@ -75,7 +75,6 @@ where import Prelude -import Data.Generic.Rep (class Generic) import Data.Tuple (Tuple(..)) import CSS.Box (BoxType) @@ -135,7 +134,6 @@ newtype BackgroundPosition = BackgroundPosition Value derive instance eqBackgroundPosition :: Eq BackgroundPosition derive instance ordBackgroundPosition :: Ord BackgroundPosition -derive instance genericBackgroundPosition :: Generic BackgroundPosition _ instance isStringBackgroundPosition :: IsString BackgroundPosition where fromString = BackgroundPosition <<< fromString @@ -167,7 +165,6 @@ newtype BackgroundSize = BackgroundSize Value derive instance eqBackgroundSize :: Eq BackgroundSize derive instance ordBackgroundSize :: Ord BackgroundSize -derive instance genericBackgroundSize :: Generic BackgroundSize _ instance isStringBackgroundSize :: IsString BackgroundSize where fromString = BackgroundSize <<< fromString @@ -205,7 +202,6 @@ newtype BackgroundRepeat = BackgroundRepeat Value derive instance eqBackgroundRepeat :: Eq BackgroundRepeat derive instance ordBackgroundRepeat :: Ord BackgroundRepeat -derive instance genericBackgroundRepeat :: Generic BackgroundRepeat _ instance isStringBackgroundRepeat :: IsString BackgroundRepeat where fromString = BackgroundRepeat <<< fromString @@ -255,7 +251,6 @@ newtype BackgroundImage = BackgroundImage Value derive instance eqBackgroundImage :: Eq BackgroundImage derive instance ordBackgroundImage :: Ord BackgroundImage -derive instance genericBackgroundImage :: Generic BackgroundImage _ instance isStringBackgroundImage :: IsString BackgroundImage where fromString = BackgroundImage <<< fromString @@ -287,7 +282,6 @@ newtype BackgroundOrigin = BackgroundOrigin Value derive instance eqBackgroundOrigin :: Eq BackgroundOrigin derive instance ordBackgroundOrigin :: Ord BackgroundOrigin -derive instance genericBackgroundOrigin :: Generic BackgroundOrigin _ instance isStringBackgroundOrigin :: IsString BackgroundOrigin where fromString = BackgroundOrigin <<< fromString @@ -316,7 +310,6 @@ newtype BackgroundClip = BackgroundClip Value derive instance eqBackgroundClip :: Eq BackgroundClip derive instance ordBackgroundClip :: Ord BackgroundClip -derive instance genericBackgroundClip :: Generic BackgroundClip _ instance isStringBackgroundClip :: IsString BackgroundClip where fromString = BackgroundClip <<< fromString @@ -345,7 +338,6 @@ newtype BackgroundAttachment = BackgroundAttachment Value derive instance eqBackgroundAttachment :: Eq BackgroundAttachment derive instance ordBackgroundAttachment :: Ord BackgroundAttachment -derive instance genericBackgroundAttachment :: Generic BackgroundAttachment _ instance isStringBackgroundAttachment :: IsString BackgroundAttachment where fromString = BackgroundAttachment <<< fromString @@ -377,7 +369,6 @@ newtype Side = Side Value derive instance eqSide :: Eq Side derive instance ordSide :: Ord Side -derive instance genericSide :: Generic Side _ instance isStringSide :: IsString Side where fromString = Side <<< fromString @@ -418,7 +409,6 @@ newtype Direction = Direction Value derive instance eqDirection :: Eq Direction derive instance ordDirection :: Ord Direction -derive instance genericDirection :: Generic Direction _ instance valDirection :: Val Direction where value (Direction v) = v @@ -436,7 +426,6 @@ newtype Location = Location Value derive instance eqLocation :: Eq Location derive instance ordLocation :: Ord Location -derive instance genericLocation :: Generic Location _ instance valLocation :: Val Location where value (Location v) = v diff --git a/src/CSS/Border.purs b/src/CSS/Border.purs index 33317ee..7ec3343 100644 --- a/src/CSS/Border.purs +++ b/src/CSS/Border.purs @@ -2,7 +2,6 @@ module CSS.Border where import Prelude -import Data.Generic.Rep (class Generic) import Data.Tuple.Nested (tuple3, tuple4) import CSS.Color (Color) @@ -15,7 +14,6 @@ newtype Stroke = Stroke Value derive instance eqStroke :: Eq Stroke derive instance ordStroke :: Ord Stroke -derive instance genericStroke :: Generic Stroke _ instance valStroke :: Val Stroke where value (Stroke v) = v diff --git a/src/CSS/Box.purs b/src/CSS/Box.purs index 21cb5e5..f630e23 100644 --- a/src/CSS/Box.purs +++ b/src/CSS/Box.purs @@ -9,8 +9,6 @@ where import Prelude -import Data.Generic.Rep (class Generic) - import CSS.Border (Stroke) import CSS.Color (Color) import CSS.Common (class Inherit, browsers) @@ -25,7 +23,6 @@ newtype BoxType = BoxType Value derive instance eqBoxType :: Eq BoxType derive instance ordBoxType :: Ord BoxType -derive instance genericBoxType :: Generic BoxType _ instance isStringBoxType :: IsString BoxType where fromString = BoxType <<< fromString diff --git a/src/CSS/Display.purs b/src/CSS/Display.purs index 105b48b..708672a 100644 --- a/src/CSS/Display.purs +++ b/src/CSS/Display.purs @@ -6,14 +6,11 @@ import CSS.Common (class Inherit, class None) import CSS.Property (class Val, Value) import CSS.String (fromString) import CSS.Stylesheet (CSS, key) -import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) newtype Position = Position Value derive instance eqPosition :: Eq Position derive instance ordPosition :: Ord Position -derive instance genericPosition :: Generic Position _ instance valPosition :: Val Position where value (Position v) = v @@ -37,7 +34,6 @@ newtype Display = Display Value derive instance eqDisplay :: Eq Display derive instance ordDisplay :: Ord Display -derive instance genericDisplay :: Generic Display _ instance valDisplay :: Val Display where value (Display v) = v @@ -111,10 +107,11 @@ display = key $ fromString "display" data Float = FloatLeft | FloatRight | FloatNone derive instance eqFloat :: Eq Float -derive instance genericFloat :: Generic Float _ instance showFloat :: Show Float where - show = genericShow + show FloatLeft = "FloatLeft" + show FloatRight = "FloatRight" + show FloatNone = "FloatNone" instance valFloat :: Val (Float) where value (FloatLeft) = fromString "left" @@ -143,10 +140,15 @@ data ClearFloat | ClearFloatInlineEnd derive instance eqClearFloat :: Eq ClearFloat -derive instance genericClearFloat :: Generic ClearFloat _ instance showClearFloat :: Show ClearFloat where - show = genericShow + show ClearFloatLeft = "ClearFloatLeft" + show ClearFloatRight = "ClearFloatRight" + show ClearFloatBoth = "ClearFloatBoth" + show ClearFloatNone = "ClearFloatNone" + show ClearFloatInherit = "ClearFloatInherit" + show ClearFloatInlineStart = "ClearFloatInlineStart" + show ClearFloatInlineEnd = "ClearFloatInlineEnd" instance valClearFloat :: Val (ClearFloat) where value (ClearFloatLeft) = fromString "left" diff --git a/src/CSS/Flexbox.purs b/src/CSS/Flexbox.purs index 4f909b6..074255a 100644 --- a/src/CSS/Flexbox.purs +++ b/src/CSS/Flexbox.purs @@ -4,8 +4,6 @@ module CSS.Flexbox where import Prelude -import Data.Generic.Rep (class Generic) - import CSS.Common (class Center, class Inherit, class Other, class Baseline, class Auto) import CSS.Property (class Val, Value, value, (!)) import CSS.Size (Size) @@ -48,7 +46,6 @@ newtype AlignContentValue = AlignContentValue Value derive instance eqAlignContentValue :: Eq AlignContentValue derive instance ordAlignContentValue :: Ord AlignContentValue -derive instance genericAlignContentValue :: Generic AlignContentValue _ instance isStringAlignContentValue :: IsString AlignContentValue where fromString = AlignContentValue <<< fromString @@ -89,7 +86,6 @@ newtype AlignItemsValue = AlignItemsValue Value derive instance eqAlignItemsValue :: Eq AlignItemsValue derive instance ordAlignItemsValue :: Ord AlignItemsValue -derive instance genericAlignItemsValue :: Generic AlignItemsValue _ instance isStringAlignItemsValue :: IsString AlignItemsValue where fromString = AlignItemsValue <<< fromString @@ -127,7 +123,6 @@ newtype AlignSelfValue = AlignSelfValue Value derive instance eqAlignSelfValue :: Eq AlignSelfValue derive instance ordAlignSelfValue :: Ord AlignSelfValue -derive instance genericAlignSelfValue :: Generic AlignSelfValue _ instance isStringAlignSelfValue :: IsString AlignSelfValue where fromString = AlignSelfValue <<< fromString @@ -180,7 +175,6 @@ newtype FlexDirection = FlexDirection Value derive instance eqFlexDirection :: Eq FlexDirection derive instance ordFlexDirection :: Ord FlexDirection -derive instance genericFlexDirection :: Generic FlexDirection _ instance valFlexDirection :: Val FlexDirection where value (FlexDirection v) = v @@ -222,7 +216,6 @@ newtype FlexWrap = FlexWrap Value derive instance eqFlexWrap :: Eq FlexWrap derive instance ordFlexWrap :: Ord FlexWrap -derive instance genericFlexWrap :: Generic FlexWrap _ instance valFlexWrap :: Val FlexWrap where value (FlexWrap v) = v @@ -248,7 +241,6 @@ newtype JustifyContentValue = JustifyContentValue Value derive instance eqJustifyContentValue :: Eq JustifyContentValue derive instance ordJustifyContentValue :: Ord JustifyContentValue -derive instance genericJustifyContentValue :: Generic JustifyContentValue _ instance isStringJustifyContentValue :: IsString JustifyContentValue where fromString = JustifyContentValue <<< fromString diff --git a/src/CSS/Font.purs b/src/CSS/Font.purs index f78c423..30cc96c 100644 --- a/src/CSS/Font.purs +++ b/src/CSS/Font.purs @@ -7,7 +7,6 @@ import CSS.Property (class Val, Value, value, quote) import CSS.Size (Size) import CSS.String (fromString) import CSS.Stylesheet (CSS, key) -import Data.Generic.Rep (class Generic) import Data.NonEmpty (NonEmpty, oneOf) color :: Color -> CSS @@ -17,7 +16,6 @@ newtype GenericFontFamily = GenericFontFamily Value derive instance eqGenericFontFamily :: Eq GenericFontFamily derive instance ordGenericFontFamily :: Ord GenericFontFamily -derive instance genericGenericFontFamily :: Generic GenericFontFamily _ instance valGenericFontFamily :: Val GenericFontFamily where value (GenericFontFamily v) = v @@ -35,7 +33,6 @@ newtype FontWeight = FontWeight Value derive instance eqFontWeight :: Eq FontWeight derive instance ordFontWeight :: Ord FontWeight -derive instance genericFontWeight :: Generic FontWeight _ instance valFontWeight :: Val FontWeight where value (FontWeight v) = v @@ -71,7 +68,6 @@ newtype FontStyle = FontStyle Value derive instance eqFontStyle :: Eq FontStyle derive instance ordFontStyle :: Ord FontStyle -derive instance genericFontStyle :: Generic FontStyle _ instance valFontStyle :: Val FontStyle where value (FontStyle v) = v diff --git a/src/CSS/FontFace.purs b/src/CSS/FontFace.purs index c1115be..9d0c581 100644 --- a/src/CSS/FontFace.purs +++ b/src/CSS/FontFace.purs @@ -2,7 +2,6 @@ module CSS.FontFace where import Prelude -import Data.Generic.Rep (class Generic) import Data.Maybe (Maybe, maybe) import Data.NonEmpty (NonEmpty) @@ -23,7 +22,6 @@ data FontFaceFormat derive instance eqFontFaceFormat :: Eq FontFaceFormat derive instance ordFontFaceFormat :: Ord FontFaceFormat -derive instance genericFontFaceFormat :: Generic FontFaceFormat _ formatName :: FontFaceFormat -> String formatName WOFF = "woff" @@ -39,7 +37,6 @@ data FontFaceSrc derive instance eqFontFaceSrc :: Eq FontFaceSrc derive instance ordFontFaceSrc :: Ord FontFaceSrc -derive instance genericFontFaceSrc :: Generic FontFaceSrc _ instance valFontFaceSrc :: Val FontFaceSrc where value (FontFaceSrcUrl u f) = fromString $ "url(" <> quote u <> ")" <> maybe "" (\f' -> " format(" <> quote (formatName f') <> ")") f diff --git a/src/CSS/Gradient.purs b/src/CSS/Gradient.purs index 3f1d419..cc162a2 100644 --- a/src/CSS/Gradient.purs +++ b/src/CSS/Gradient.purs @@ -29,7 +29,6 @@ where import Prelude -import Data.Generic.Rep (class Generic) import Data.Tuple (Tuple(..)) import CSS.Background (class Loc, BackgroundImage, Direction, sideTop, straight, sideLeft) @@ -89,7 +88,6 @@ newtype Radial = Radial Value derive instance eqRadial :: Eq Radial derive instance ordRadial :: Ord Radial -derive instance genericRadial :: Generic Radial _ instance valRadial :: Val Radial where value (Radial v) = v @@ -113,7 +111,6 @@ newtype Extend = Extend Value derive instance eqExtend :: Eq Extend derive instance ordExtend :: Ord Extend -derive instance genericExtend :: Generic Extend _ instance valExtend :: Val Extend where value (Extend v) = v diff --git a/src/CSS/ListStyle/Image.purs b/src/CSS/ListStyle/Image.purs index 47507fd..11ae8cc 100644 --- a/src/CSS/ListStyle/Image.purs +++ b/src/CSS/ListStyle/Image.purs @@ -6,11 +6,9 @@ import CSS.String (fromString) import CSS.Stylesheet (CSS, key) import Data.Eq (class Eq) import Data.Function (($)) -import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Ord (class Ord) import Data.Semigroup ((<>)) -import Data.Show (class Show) +import Data.Show (class Show, show) data ListStyleImage = ListStyleImage String @@ -21,10 +19,13 @@ data ListStyleImage derive instance eqListStyleImage :: Eq ListStyleImage derive instance ordListStyleImage :: Ord ListStyleImage -derive instance genericListStyleImage :: Generic ListStyleImage _ instance showListStyleImage :: Show ListStyleImage where - show = genericShow + show (ListStyleImage url) = "(ListStyleImage " <> show url <> ")" + show Initial = "Initial" + show Inherit = "Inherit" + show Unset = "Unset" + show None = "None" instance valListStyleImage :: Val ListStyleImage where value (Initial) = fromString "initial" diff --git a/src/CSS/ListStyle/Position.purs b/src/CSS/ListStyle/Position.purs index 1b26442..c800bc3 100644 --- a/src/CSS/ListStyle/Position.purs +++ b/src/CSS/ListStyle/Position.purs @@ -6,8 +6,6 @@ import CSS.String (fromString) import CSS.Stylesheet (CSS, key) import Data.Eq (class Eq) import Data.Function (($)) -import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Ord (class Ord) import Data.Show (class Show) @@ -20,10 +18,13 @@ data ListStylePosition derive instance eqListStylePosition :: Eq ListStylePosition derive instance ordListStylePosition :: Ord ListStylePosition -derive instance genericListStylePosition :: Generic ListStylePosition _ instance showListStylePosition :: Show ListStylePosition where - show = genericShow + show Inside = "Inside" + show Outside = "Outside" + show Inherit = "Inherit" + show Initial = "Initial" + show Unset = "Unset" instance valListStylePosition :: Val ListStylePosition where value (Inside) = fromString "inside" diff --git a/src/CSS/ListStyle/Type.purs b/src/CSS/ListStyle/Type.purs index 8aee9b2..e68f278 100644 --- a/src/CSS/ListStyle/Type.purs +++ b/src/CSS/ListStyle/Type.purs @@ -6,11 +6,9 @@ import CSS.String (fromString) import CSS.Stylesheet (CSS, key) import Data.Eq (class Eq) import Data.Function (($)) -import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Ord (class Ord) import Data.Semigroup ((<>)) -import Data.Show (class Show) +import Data.Show (class Show, show) data ListStyleType = Disc @@ -29,10 +27,21 @@ data ListStyleType derive instance eqListStyleType :: Eq ListStyleType derive instance ordListStyleType :: Ord ListStyleType -derive instance genericListStyleType :: Generic ListStyleType _ instance showListStyleType :: Show ListStyleType where - show = genericShow + show Disc = "Disc" + show Circle = "Circle" + show Square = "Square" + show Decimal = "Decimal" + show Georgian = "Georgian" + show CJKIdeographic = "CJKIdeographic" + show Kannada = "Kannada" + show None = "None" + show Inherit = "Inherit" + show Initial = "Initial" + show Unset = "Unset" + show (CustomStyleType s) = "(CustomStyleType " <> show s <> ")" + show (StringStyleType s) = "(StringStyleType " <> show s <> ")" instance valListStyleType :: Val ListStyleType where value (Disc) = fromString "disc" diff --git a/src/CSS/Overflow.purs b/src/CSS/Overflow.purs index 7147b59..30fc81c 100644 --- a/src/CSS/Overflow.purs +++ b/src/CSS/Overflow.purs @@ -2,8 +2,6 @@ module CSS.Overflow where import Prelude -import Data.Generic.Rep (class Generic) - import CSS.Property (class Val, Value) import CSS.String (fromString) import CSS.Stylesheet (CSS, key) @@ -12,7 +10,6 @@ newtype Overflow = Overflow Value derive instance eqOverflow :: Eq Overflow derive instance ordOverflow :: Ord Overflow -derive instance genericOverflow :: Generic Overflow _ instance valOverflow :: Val Overflow where value (Overflow v) = v diff --git a/src/CSS/Property.purs b/src/CSS/Property.purs index 825f744..fa775fe 100644 --- a/src/CSS/Property.purs +++ b/src/CSS/Property.purs @@ -5,7 +5,6 @@ import Prelude import CSS.String (class IsString, fromString) import Color (Color, cssStringHSLA) import Data.Foldable (intercalate) -import Data.Generic.Rep (class Generic) import Data.Maybe (fromMaybe) import Data.NonEmpty (NonEmpty, oneOf) import Data.Profunctor.Strong (second) @@ -17,7 +16,6 @@ data Prefixed derive instance eqPrefixed :: Eq Prefixed derive instance ordPrefixed :: Ord Prefixed -derive instance genericPrefixed :: Generic Prefixed _ instance isStringPrefixed :: IsString Prefixed where fromString = Plain @@ -43,7 +41,6 @@ newtype Key a = Key Prefixed derive instance eqKey :: (Eq a) => Eq (Key a) derive instance ordKey :: (Ord a) => Ord (Key a) -derive instance genericKey :: (Generic a rep) => Generic (Key a) _ instance isStringKey :: IsString (Key a) where fromString = Key <<< fromString @@ -55,7 +52,6 @@ newtype Value = Value Prefixed derive instance eqValue :: Eq Value derive instance ordValue :: Ord Value -derive instance genericValue :: Generic Value _ instance isStringValue :: IsString Value where fromString = Value <<< fromString @@ -73,7 +69,6 @@ newtype Literal = Literal String derive instance eqLiteral :: Eq Literal derive instance ordLiteral :: Ord Literal -derive instance genericLiteral :: Generic Literal _ instance valLiteral :: Val Literal where value (Literal a) = fromString $ quote a diff --git a/src/CSS/Render.purs b/src/CSS/Render.purs index 4adc6b3..2c03db8 100644 --- a/src/CSS/Render.purs +++ b/src/CSS/Render.purs @@ -9,7 +9,6 @@ import CSS.Stylesheet (CSS, StyleM, App(..), Feature(..), Keyframes(..), MediaQu import Data.Array (null, (:), drop, sort, uncons, mapMaybe) import Data.Either (Either(..), either) import Data.Foldable (fold, foldMap, intercalate) -import Data.Generic.Rep (class Generic) import Data.Maybe (Maybe(..), fromMaybe, maybe) import Data.NonEmpty (NonEmpty(..), (:|), foldl1, oneOf) import Data.These (These(..), theseLeft, theseRight) @@ -21,7 +20,6 @@ newtype Inline = Inline String derive instance eqInline :: Eq Inline derive instance ordInline :: Ord Inline -derive instance genericInline :: Generic Inline _ getInline :: Inline -> String getInline (Inline s) = s @@ -36,7 +34,6 @@ newtype Sheet = Sheet String derive instance eqSheet :: Eq Sheet derive instance ordSheet :: Ord Sheet -derive instance genericSheet :: Generic Sheet _ getSheet :: Sheet -> String getSheet (Sheet s) = s diff --git a/src/CSS/Selector.purs b/src/CSS/Selector.purs index 05ebad7..850962b 100644 --- a/src/CSS/Selector.purs +++ b/src/CSS/Selector.purs @@ -2,7 +2,6 @@ module CSS.Selector where import Prelude -import Data.Generic.Rep (class Generic) import Data.String (take, drop) import CSS.String (class IsString) @@ -22,13 +21,11 @@ data Predicate derive instance eqPredicate :: Eq Predicate derive instance ordPredicate :: Ord Predicate -derive instance genericPredicate :: Generic Predicate _ newtype Refinement = Refinement (Array Predicate) derive instance eqRefinement :: Eq Refinement derive instance ordRefinement :: Ord Refinement -derive instance genericRefinement :: Generic Refinement _ instance isStringRefinement :: IsString Refinement where fromString s = @@ -51,13 +48,11 @@ data Path f derive instance eqPath :: (Eq f) => Eq (Path f) derive instance ordPath :: (Ord f) => Ord (Path f) -derive instance genericPath :: (Generic f rep) => Generic (Path f) _ data Selector = Selector Refinement (Path Selector) derive instance eqSelector :: Eq Selector derive instance ordSelector :: Ord Selector -derive instance genericSelector :: Generic Selector _ instance isStringSelector :: IsString Selector where fromString s = diff --git a/src/CSS/Size.purs b/src/CSS/Size.purs index b8cd804..ff2edce 100644 --- a/src/CSS/Size.purs +++ b/src/CSS/Size.purs @@ -2,8 +2,6 @@ module CSS.Size where import Prelude -import Data.Generic.Rep (class Generic) - import CSS.Common (class Auto) import CSS.Property (class Val, Value, value) import CSS.String (class IsString, fromString) @@ -12,7 +10,6 @@ newtype Size a = Size Value derive instance eqSize :: Eq a => Eq (Size a) derive instance ordSize :: Ord a => Ord (Size a) -derive instance genericSize :: Generic a rep => Generic (Size a) _ instance isStringSize :: IsString (Size a) where fromString = Size <<< fromString @@ -69,7 +66,6 @@ newtype Angle a = Angle Value derive instance eqAngle :: Eq a => Eq (Angle a) derive instance ordAngle :: Ord a => Ord (Angle a) -derive instance genericAngle :: Generic a rep => Generic (Angle a) _ instance valAngle :: Val (Angle a) where value (Angle v) = v diff --git a/src/CSS/Stylesheet.purs b/src/CSS/Stylesheet.purs index 2e2a6e8..0b458ed 100644 --- a/src/CSS/Stylesheet.purs +++ b/src/CSS/Stylesheet.purs @@ -6,7 +6,6 @@ import Control.Monad.Writer (Writer, execWriter) import Control.Monad.Writer.Class (tell) import Data.Array (singleton) -import Data.Generic.Rep (class Generic) import Data.Maybe (Maybe(..)) import Data.NonEmpty (NonEmpty, (:|)) import Data.Profunctor.Strong (second) @@ -19,25 +18,21 @@ newtype MediaType = MediaType Value derive instance eqMediaType :: Eq MediaType derive instance ordMediaType:: Ord MediaType -derive instance genericMediaType :: Generic MediaType _ data NotOrOnly = Not | Only derive instance eqNotOrOnly :: Eq NotOrOnly derive instance ordNotOrOnly:: Ord NotOrOnly -derive instance genericNotOrOnly :: Generic NotOrOnly _ data MediaQuery = MediaQuery (Maybe NotOrOnly) MediaType (NonEmpty Array Feature) derive instance eqMediaQuery :: Eq MediaQuery derive instance ordMediaQuery :: Ord MediaQuery -derive instance genericMediaQuery :: Generic MediaQuery _ data Feature = Feature String (Maybe Value) derive instance eqFeature :: Eq Feature derive instance ordFeature :: Ord Feature -derive instance genericFeature :: Generic Feature _ data App = Self Refinement @@ -48,13 +43,11 @@ data App derive instance eqApp :: Eq App derive instance ordApp :: Ord App -derive instance genericApp :: Generic App _ data Keyframes = Keyframes String (NonEmpty Array (Tuple Number (Array Rule))) derive instance eqKeyframes :: Eq Keyframes derive instance ordKeyframes :: Ord Keyframes -derive instance genericKeyframes :: Generic Keyframes _ data Rule = Property (Key Unit) Value @@ -66,7 +59,6 @@ data Rule derive instance eqRule :: Eq Rule derive instance ordRule :: Ord Rule -derive instance genericRule :: Generic Rule _ newtype StyleM a = S (Writer (Array Rule) a) diff --git a/src/CSS/Text.purs b/src/CSS/Text.purs index 10c181e..4dabe5c 100644 --- a/src/CSS/Text.purs +++ b/src/CSS/Text.purs @@ -5,7 +5,6 @@ import CSS.Property (class Val, Value) import CSS.Size (Size) import CSS.String (fromString) import CSS.Stylesheet (CSS, key) -import Data.Generic.Rep (class Generic) letterSpacing :: forall a. Size a -> CSS letterSpacing = key $ fromString "letter-spacing" @@ -14,7 +13,6 @@ newtype TextDecoration = TextDecoration Value derive instance eqTextDecoration :: Eq TextDecoration derive instance ordTextDecoration:: Ord TextDecoration -derive instance genericTextDecoration :: Generic TextDecoration _ instance valTextDecoration :: Val TextDecoration where value (TextDecoration v) = v diff --git a/src/CSS/Text/Transform.purs b/src/CSS/Text/Transform.purs index 4e59779..a48d54c 100644 --- a/src/CSS/Text/Transform.purs +++ b/src/CSS/Text/Transform.purs @@ -12,8 +12,6 @@ import CSS.String (fromString) import CSS.Stylesheet (CSS, key) import Data.Eq (class Eq) import Data.Function (($)) -import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Ord (class Ord) import Data.Show (class Show) @@ -27,7 +25,6 @@ data TextTransform derive instance eqTextTransform :: Eq TextTransform derive instance ordTextTransform :: Ord TextTransform -derive instance genericTextTransform :: Generic TextTransform _ instance valTextTransform :: Val TextTransform where value (Uppercase) = fromString "uppercase" @@ -38,7 +35,12 @@ instance valTextTransform :: Val TextTransform where value (Inherit) = fromString "inherit" instance showTextTransform :: Show (TextTransform) where - show = genericShow + show Uppercase = "Uppercase" + show Lowercase = "Lowercase" + show Capitalize = "Capitalize" + show None = "None" + show Initial = "Initial" + show Inherit = "Inherit" instance noneTextTransform :: None TextTransform where none = None diff --git a/src/CSS/Text/Whitespace.purs b/src/CSS/Text/Whitespace.purs index 4dab8be..0028e07 100644 --- a/src/CSS/Text/Whitespace.purs +++ b/src/CSS/Text/Whitespace.purs @@ -10,8 +10,6 @@ module CSS.Text.Whitespace import Prelude -import Data.Generic.Rep (class Generic) - import CSS.Property (class Val, Value) import CSS.String (fromString) import CSS.Stylesheet (CSS, key) @@ -20,7 +18,6 @@ newtype TextWhitespace = TextWhitespace Value derive instance eqTextWhitespace :: Eq TextWhitespace derive instance ordTextWhitespace :: Ord TextWhitespace -derive instance genericTextWhitespace :: Generic TextWhitespace _ instance valTextWhitespace :: Val TextWhitespace where value (TextWhitespace v) = v diff --git a/src/CSS/TextAlign.purs b/src/CSS/TextAlign.purs index e17cca5..9081e1e 100644 --- a/src/CSS/TextAlign.purs +++ b/src/CSS/TextAlign.purs @@ -2,8 +2,6 @@ module CSS.TextAlign where import Prelude -import Data.Generic.Rep (class Generic) - import CSS.Property (class Val, Value) import CSS.String (fromString) import CSS.Stylesheet (CSS, key) @@ -12,7 +10,6 @@ newtype TextAlign = TextAlign Value derive instance eqTextAlign :: Eq TextAlign derive instance ordTextAlign:: Ord TextAlign -derive instance genericTextAlign :: Generic TextAlign _ instance valTextAlign :: Val TextAlign where value (TextAlign v) = v diff --git a/src/CSS/Time.purs b/src/CSS/Time.purs index 4fde9f6..48f85e4 100644 --- a/src/CSS/Time.purs +++ b/src/CSS/Time.purs @@ -2,8 +2,6 @@ module CSS.Time where import Prelude -import Data.Generic.Rep (class Generic) - import CSS.Property (class Val, Value, value) import CSS.String (fromString) @@ -11,7 +9,6 @@ newtype Time = Time Value derive instance eqTime :: Eq Time derive instance ordTime:: Ord Time -derive instance genericTime :: Generic Time _ instance valTime :: Val Time where value (Time v) = v diff --git a/src/CSS/Transform.purs b/src/CSS/Transform.purs index bd51ee7..3c2f605 100644 --- a/src/CSS/Transform.purs +++ b/src/CSS/Transform.purs @@ -6,14 +6,12 @@ import CSS.Property (class Val, Value, noCommas, value) import CSS.Size (Angle, Abs, Size) import CSS.String (fromString) import CSS.Stylesheet (CSS, key) -import Data.Generic.Rep (class Generic) import Data.Tuple.Nested (tuple3) newtype Transformation = Transformation Value derive instance eqTransformation :: Eq Transformation derive instance ordTransformation:: Ord Transformation -derive instance genericTransformation :: Generic Transformation _ instance valTransformation :: Val Transformation where value (Transformation v) = v diff --git a/src/CSS/Transition.purs b/src/CSS/Transition.purs index ab61079..a6374b0 100644 --- a/src/CSS/Transition.purs +++ b/src/CSS/Transition.purs @@ -2,8 +2,6 @@ module CSS.Transition where import Prelude -import Data.Generic.Rep (class Generic) - import CSS.String (fromString) import CSS.Property (class Val, Value) @@ -11,7 +9,6 @@ newtype TimingFunction = TimingFunction Value derive instance eqTimingFunction :: Eq TimingFunction derive instance ordTimingFunction:: Ord TimingFunction -derive instance genericTimingFunction :: Generic TimingFunction _ instance valTimingFunction :: Val TimingFunction where value (TimingFunction v) = v