Skip to content

Commit 3fe427e

Browse files
authored
Merge pull request #33 from deamme/master
updated for purescript v0.9.1
2 parents b53130a + 0750964 commit 3fe427e

File tree

8 files changed

+38
-45
lines changed

8 files changed

+38
-45
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: node_js
2-
sudo: false
2+
dist: trusty
3+
sudo: required
34
node_js:
45
- 4
56
install:

bower.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@
2121
"tests"
2222
],
2323
"dependencies": {
24-
"purescript-generics": "^0.7.0",
25-
"purescript-nonempty": "^0.1.2",
26-
"purescript-profunctor": "^0.3.1",
27-
"purescript-strings": "^0.7.0",
28-
"purescript-these": "^0.3.0",
29-
"purescript-transformers": "^0.8.1",
30-
"purescript-colors": "^0.4.3"
24+
"purescript-generics": "^1.0.0",
25+
"purescript-nonempty": "^1.0.0",
26+
"purescript-profunctor": "^1.0.0",
27+
"purescript-strings": "^1.0.0",
28+
"purescript-these": "^1.0.0",
29+
"purescript-transformers": "^1.0.0",
30+
"purescript-colors": "^1.0.0",
31+
"purescript-console": "^1.0.0"
3132
},
3233
"devDependencies": {
33-
"purescript-exceptions": "^0.3.0"
34+
"purescript-exceptions": "^1.0.0"
3435
}
3536
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"gulp": "^3.8.11",
55
"gulp-jscs": "^1.6.0",
66
"gulp-jshint": "^1.11.2",
7-
"gulp-purescript": "^0.7.0",
7+
"gulp-purescript": "^1.0.0",
88
"gulp-run": "^1.6.8",
9-
"purescript": "^0.8.2"
9+
"purescript": "^0.9.1"
1010
}
1111
}

src/CSS/Background.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ module CSS.Background
6868
, angular
6969

7070
, Location
71-
, Loc
71+
, class Loc
7272
, location
7373
)
7474
where

src/CSS/Property.purs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Prelude
44

55
import Data.Foldable (intercalate)
66
import Data.Maybe (fromMaybe)
7-
import Data.Monoid (Monoid, mempty)
7+
import Data.Monoid (class Monoid, mempty)
88
import Data.NonEmpty (NonEmpty(), oneOf)
99
import Data.Profunctor.Strong (second)
1010
import Data.Tuple (Tuple(..), lookup)
@@ -21,8 +21,8 @@ instance isStringPrefixed :: IsString Prefixed where
2121

2222
instance semigroupPrefixed :: Semigroup Prefixed where
2323
append (Plain x) (Plain y) = Plain $ x <> y
24-
append (Plain x) (Prefixed ys) = Prefixed $ second (x <>) <$> ys
25-
append (Prefixed xs) (Plain y) = Prefixed $ second (y <>) <$> xs
24+
append (Plain x) (Prefixed ys) = Prefixed $ second (x <> _) <$> ys
25+
append (Prefixed xs) (Plain y) = Prefixed $ second (y <> _) <$> xs
2626
append (Prefixed xs) (Prefixed ys) = Prefixed $ xs <> ys
2727

2828
instance monoidPrefixed :: Monoid Prefixed where
@@ -76,7 +76,7 @@ instance valNumber :: Val Number where
7676
value = fromString <<< show
7777

7878
instance valList :: (Val a) => Val (Array a) where
79-
value = intercalate (fromString ", ") <<< (value <$>)
79+
value = intercalate (fromString ", ") <<< (value <$> _)
8080

8181
instance valNonEmpty :: (Val a) => Val (NonEmpty Array a) where
8282
value = value <<< oneOf
@@ -85,9 +85,6 @@ instance valColor :: Val Color where
8585
value = fromString <<< cssStringHSLA
8686

8787
noCommas :: forall a. (Val a) => Array a -> Value
88-
noCommas = intercalate (fromString " ") <<< (value <$>)
88+
noCommas = intercalate (fromString " ") <<< (value <$> _)
8989

90-
infixr 9 !
91-
92-
(!) :: forall a b. a -> b -> Tuple a b
93-
(!) = Tuple
90+
infixr 9 Tuple as !

src/CSS/Render.purs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import Control.Monad.Eff (Eff)
55
import Control.Monad.Eff.Console (log, CONSOLE)
66
import Data.Array (null, (:), drop, sort, uncons, mapMaybe)
77
import Data.Either (Either(..), either)
8-
import Data.Foldable (fold, foldMap, intercalate, mconcat)
8+
import Data.Foldable (fold, foldMap, intercalate)
99
import Data.Maybe (Maybe(..), fromMaybe, maybe)
10-
import Data.Monoid (Monoid, mempty)
10+
import Data.Monoid (class Monoid, mempty)
1111
import Data.NonEmpty (NonEmpty(..), (:|), foldl1, oneOf)
1212
import Data.These (These(..), theseLeft, theseRight)
1313
import Data.Tuple (Tuple(..), lookup, uncurry)
@@ -42,10 +42,10 @@ instance monoidFile :: Monoid Sheet where
4242
type Rendered = Maybe (These Inline Sheet)
4343

4444
renderedInline :: Rendered -> Maybe String
45-
renderedInline = (>>= (map getInline <<< theseLeft))
45+
renderedInline = (_ >>= (map getInline <<< theseLeft))
4646

4747
renderedSheet :: Rendered -> Maybe String
48-
renderedSheet = (>>= (map getSheet <<< theseRight))
48+
renderedSheet = (_ >>= (map getSheet <<< theseRight))
4949

5050
render :: forall a. StyleM a -> Rendered
5151
render = rules [] <<< runS
@@ -71,7 +71,7 @@ kframe (Keyframes ident xs) =
7171
, "@-o-keyframes"
7272
]
7373
allKeywordsWithContent =
74-
mconcat $ map (_ <> renderContent) keywords
74+
fold $ map (_ <> renderContent) keywords
7575

7676
frame :: Number -> Array Rule -> String
7777
frame p rs = show p <> "% " <> "{ " <> x <> " }"
@@ -81,7 +81,7 @@ query' :: MediaQuery -> Array App -> Array Rule -> Rendered
8181
query' q sel rs = Just <<< That <<< Sheet $ mediaQuery q <> " { " <> fromMaybe "" (renderedSheet $ rules sel rs) <> " }\n"
8282

8383
mediaQuery :: MediaQuery -> String
84-
mediaQuery (MediaQuery no ty fs) = "@media " <> mediaType ty <> foldl1 (<>) ((" and " <>) <<< feature <$> fs)
84+
mediaQuery (MediaQuery no ty fs) = "@media " <> mediaType ty <> foldl1 (<>) ((" and " <> _) <<< feature <$> fs)
8585

8686
mediaType :: MediaType -> String
8787
mediaType (MediaType (Value s)) = plain s
@@ -130,7 +130,7 @@ selector :: Selector -> String
130130
selector = intercalate ", " <<< selector'
131131

132132
selector' :: Selector -> Array String
133-
selector' (Selector (Refinement ft) p) = (<> (foldMap predicate (sort ft))) <$> selector'' ft p
133+
selector' (Selector (Refinement ft) p) = (_ <> (foldMap predicate (sort ft))) <$> selector'' ft p
134134

135135
selector'' :: Array Predicate -> Path Selector -> Array String
136136
selector'' [] Star = ["*"]
@@ -151,11 +151,11 @@ collect' :: Prefixed -> Prefixed -> Array (Either String (Tuple String String))
151151
collect' (Plain k) (Plain v) = [Right (Tuple k v)]
152152
collect' (Prefixed ks) (Plain v) = (\(Tuple p k) -> Right $ Tuple (p <> k) v) <$> ks
153153
collect' (Plain k) (Prefixed vs) = (\(Tuple p v) -> Right $ Tuple k (p <> v)) <$> vs
154-
collect' (Prefixed ks) (Prefixed vs) = (\(Tuple p k) -> maybe (Left (p <> k)) (Right <<< Tuple (p <> k) <<< (p <>)) $ lookup p vs) <$> ks
154+
collect' (Prefixed ks) (Prefixed vs) = (\(Tuple p k) -> maybe (Left (p <> k)) (Right <<< Tuple (p <> k) <<< (p <> _)) $ lookup p vs) <$> ks
155155

156156
properties :: Array (Either String (Tuple String String)) -> String
157157
properties xs = intercalate "; " $ sheetRules <$> xs
158-
where sheetRules = either (\_ -> mempty) (\(Tuple k v) -> mconcat [k, ": ", v])
158+
where sheetRules = either (\_ -> mempty) (\(Tuple k v) -> fold [k, ": ", v])
159159

160160
merger :: NonEmpty Array App -> Selector
161161
merger (NonEmpty x xs) =

src/CSS/Selector.purs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module CSS.Selector where
22

33
import Prelude
44

5-
import Data.Generic (Generic, gEq, gCompare)
5+
import Data.Generic (class Generic, gEq, gCompare)
66
import Data.String (take, drop)
77

88
import CSS.String
@@ -61,18 +61,12 @@ element e = Selector (Refinement []) (Elem e)
6161

6262
deep :: Selector -> Selector -> Selector
6363
deep a b = Selector (Refinement []) (Deep a b)
64-
65-
(**) :: Selector -> Selector -> Selector
66-
(**) = deep
64+
infix 0 deep as **
6765

6866
child :: Selector -> Selector -> Selector
6967
child a b = Selector (Refinement []) (PathChild a b)
70-
71-
(|>) :: Selector -> Selector -> Selector
72-
(|>) = child
68+
infix 0 child as |>
7369

7470
with :: Selector -> Refinement -> Selector
75-
with (Selector (Refinement fs) e) (Refinement ps) = Selector (Refinement (fs ++ ps)) e
76-
77-
(##) :: Selector -> Refinement -> Selector
78-
(##) = with
71+
with (Selector (Refinement fs) e) (Refinement ps) = Selector (Refinement (fs <> ps)) e
72+
infix 0 child as ##

src/CSS/Stylesheet.purs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Data.NonEmpty (NonEmpty(), (:|))
1212
import Data.Profunctor.Strong (second)
1313
import Data.Tuple (Tuple(..))
1414

15-
import CSS.Property (Val, Key(Key), Prefixed, Value(), cast, value)
15+
import CSS.Property (class Val, Key(Key), Prefixed, Value(), cast, value)
1616
import CSS.Selector (Selector(), Refinement())
1717

1818
newtype MediaType = MediaType Value
@@ -71,9 +71,9 @@ key k v = rule $ Property (cast k) (value v)
7171
prefixed :: forall a. Val a => Prefixed -> a -> CSS
7272
prefixed xs = key (Key xs)
7373

74-
infixr 5 ?
75-
(?) :: Selector -> CSS -> CSS
76-
(?) sel rs = rule $ Nested (Sub sel) (runS rs)
74+
infixr 5 select as ?
75+
select :: Selector -> CSS -> CSS
76+
select sel rs = rule $ Nested (Sub sel) (runS rs)
7777

7878
query :: MediaType -> NonEmpty Array Feature -> CSS -> CSS
7979
query ty fs = rule <<< Query (MediaQuery Nothing ty fs) <<< runS

0 commit comments

Comments
 (0)