Skip to content

Commit 150ae11

Browse files
committed
Merge pull request #5 from slamdata/qualify-imports
Qualify all external imports
2 parents 7c8b067 + c19abe8 commit 150ae11

22 files changed

+76
-41
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"tests"
1818
],
1919
"dependencies": {
20-
"purescript-nonempty": "^0.1.1",
20+
"purescript-nonempty": "^0.1.2",
2121
"purescript-profunctor": "^0.3.0",
2222
"purescript-strings": "^0.5.2",
2323
"purescript-these": "^0.3.0",

src/Css/Animation.purs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module Css.Animation where
22

33
import Prelude
4+
5+
import Data.Tuple.Nested (tuple7)
6+
47
import Css.Property
58
import Css.String
69
import Css.Stylesheet
710
import Css.Time
811
import Css.Transition
9-
import Data.Tuple.Nested
1012

1113
newtype AnimationDirection = AnimationDirection Value
1214

src/Css/Background.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Background where
22

33
import Prelude
4+
45
import Css.Color
56
import Css.Property
67
import Css.String

src/Css/Border.purs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module Css.Border where
22

33
import Prelude
4+
5+
import Data.Tuple.Nested (tuple3, tuple4)
6+
47
import Css.Color
58
import Css.Property
69
import Css.Size
710
import Css.String
811
import Css.Stylesheet
9-
import Data.Tuple.Nested
1012

1113
newtype Stroke = Stroke Value
1214

src/Css/Color.purs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module Css.Color where
22

33
import Prelude
4+
5+
import Data.Foldable (intercalate)
6+
47
import Css.Property
58
import Css.String
6-
import Data.Foldable
79

810
data Color = Rgba Int Int Int Int
911
| Hsla Number Number Number Number

src/Css/Display.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Display where
22

33
import Prelude
4+
45
import Css.Property
56
import Css.String
67
import Css.Stylesheet

src/Css/Elements.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Elements where
22

33
import Prelude
4+
45
import Css.Selector
56
import Css.String
67

src/Css/Font.purs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
module Css.Font where
22

33
import Prelude
4+
5+
import Data.NonEmpty (NonEmpty(), oneOf)
6+
47
import Css.Color
58
import Css.Property
69
import Css.Size
710
import Css.String
811
import Css.Stylesheet
9-
import Data.NonEmpty
12+
1013

1114
color :: Color -> Css
1215
color = key $ fromString "color"

src/Css/FontFace.purs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
module Css.FontFace where
22

33
import Prelude
4+
5+
import Data.Maybe (Maybe(), maybe)
6+
import Data.NonEmpty (NonEmpty())
7+
48
import Css.Property
59
import Css.String
610
import Css.Stylesheet
7-
import Data.Maybe
8-
import Data.NonEmpty
911

1012
fontFaceFamily :: String -> Css
1113
fontFaceFamily = key (fromString "font-family") <<< Literal

src/Css/Geometry.purs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
module Css.Geometry where
22

33
import Prelude hiding (top, bottom)
4+
5+
import Data.Tuple.Nested (tuple4)
6+
47
import Css.Size
58
import Css.String
69
import Css.Stylesheet
7-
import Data.Tuple.Nested
810

911
width :: forall a. Size a -> Css
1012
width = key $ fromString "width"

src/Css/Gradient.purs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module Css.Gradient where
22

33
import Prelude
4+
5+
import Data.Foldable (intercalate)
6+
47
import Css.Background
58
import Css.Color
69
import Css.Property
710
import Css.Size
811
import Css.String
9-
import Data.Foldable
1012

1113
data ColorPoint = ColorPoint Color (Size Rel)
1214

src/Css/Media.purs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
module Css.Media where
22

33
import Prelude
4+
5+
import Data.Maybe (Maybe(..))
6+
47
import Css.Property
58
import Css.Size
69
import Css.String
710
import Css.Stylesheet
8-
import Data.Maybe
911

1012
screen :: MediaType
1113
screen = MediaType $ fromString "screen"

src/Css/Property.purs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
module Css.Property where
22

33
import Prelude
4+
5+
import Data.Foldable (intercalate)
6+
import Data.Maybe (Maybe(), fromMaybe)
7+
import Data.Monoid (Monoid, mempty)
8+
import Data.NonEmpty (NonEmpty(), oneOf)
9+
import Data.Profunctor.Strong (second)
10+
import Data.Tuple (Tuple(..), lookup)
11+
412
import Css.String
5-
import Data.Foldable
6-
import Data.Maybe
7-
import Data.Monoid
8-
import Data.Profunctor.Strong
9-
import Data.Tuple
10-
import Data.NonEmpty
1113

1214
data Prefixed = Prefixed (Array (Tuple String String))
1315
| Plain String

src/Css/Pseudo.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Pseudo where
22

33
import Prelude
4+
45
import Css.Selector
56
import Css.String
67

src/Css/Render.purs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
module Css.Render where
22

33
import Prelude
4+
5+
import Data.Array ((:), drop, sort, uncons, mapMaybe)
6+
import Data.Either (Either(..), either)
7+
import Data.Foldable (foldMap, intercalate, mconcat)
8+
import Data.Maybe (Maybe(..), fromMaybe, maybe)
9+
import Data.Monoid (Monoid, mempty)
10+
import Data.NonEmpty (NonEmpty(..), (:|), foldl1, oneOf)
11+
import Data.These (These(..), theseLeft, theseRight)
12+
import Data.Tuple (Tuple(..), lookup, uncurry)
13+
414
import Css.Property
515
import Css.Selector
616
import Css.String
717
import Css.Stylesheet
8-
import Data.Array
9-
import Data.Either
10-
import Data.Foldable
11-
import Data.Maybe
12-
import Data.Monoid
13-
import Data.These
14-
import Data.Tuple
15-
import Data.NonEmpty
1618

1719
newtype Inline = Inline String
1820

src/Css/Selector.purs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
module Css.Selector where
22

33
import Prelude
4+
5+
import Data.String (take, drop)
6+
47
import Css.String
5-
import qualified Data.String as S
68

79
data Predicate = Id String
810
| Class String
@@ -25,11 +27,11 @@ instance ordPredicate :: Ord Predicate where
2527
newtype Refinement = Refinement (Array Predicate)
2628

2729
instance isStringRefinement :: IsString Refinement where
28-
fromString s = Refinement [ case S.take 1 s of
29-
"#" -> Id $ S.drop 1 s
30-
"." -> Class $ S.drop 1 s
31-
":" -> Pseudo $ S.drop 1 s
32-
"@" -> Attr $ S.drop 1 s
30+
fromString s = Refinement [ case take 1 s of
31+
"#" -> Id $ drop 1 s
32+
"." -> Class $ drop 1 s
33+
":" -> Pseudo $ drop 1 s
34+
"@" -> Attr $ drop 1 s
3335
_ -> Attr s
3436
]
3537

@@ -43,9 +45,9 @@ data Path f = Star
4345
data Selector = Selector Refinement (Path Selector)
4446

4547
instance isStringSelector :: IsString Selector where
46-
fromString s = case S.take 1 s of
47-
"#" -> Selector (Refinement [Id $ S.drop 1 s]) Star
48-
"." -> Selector (Refinement [Class $ S.drop 1 s]) Star
48+
fromString s = case take 1 s of
49+
"#" -> Selector (Refinement [Id $ drop 1 s]) Star
50+
"." -> Selector (Refinement [Class $ drop 1 s]) Star
4951
_ -> Selector (Refinement []) (Elem s)
5052

5153
star :: Selector

src/Css/Size.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Size where
22

33
import Prelude
4+
45
import Css.Property
56
import Css.String
67

src/Css/Stylesheet.purs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
module Css.Stylesheet where
22

33
import Prelude
4-
import Control.Monad.Writer
5-
import Control.Monad.Writer.Class
6-
import Css.Property
7-
import Css.Selector
4+
5+
import Control.Monad.Writer (Writer(), execWriter)
6+
import Control.Monad.Writer.Class (tell)
7+
88
import Data.Array (singleton)
9-
import Data.Maybe
10-
import Data.Profunctor.Strong
11-
import Data.Tuple
12-
import Data.NonEmpty
9+
import Data.Maybe (Maybe(..))
10+
import Data.NonEmpty (NonEmpty(), (:|))
11+
import Data.Profunctor.Strong (second)
12+
import Data.Tuple (Tuple(..))
13+
14+
import Css.Property (Val, Key(), Value(), cast, value)
15+
import Css.Selector (Selector(), Refinement())
1316

1417
newtype MediaType = MediaType Value
1518

src/Css/Text.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Text where
22

33
import Prelude
4+
45
import Css.Property
56
import Css.String
67
import Css.Stylesheet

src/Css/Time.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Time where
22

33
import Prelude
4+
45
import Css.Property
56
import Css.String
67

src/Css/Transform.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Transform where
22

33
import Prelude
4+
45
import Css.Property
56
import Css.Size
67
import Css.String

src/Css/Transition.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module Css.Transition where
22

33
import Prelude
4+
45
import Css.String
56
import Css.Property
67

0 commit comments

Comments
 (0)