Merge pull request #14 from cryogenian/10-updates

0.10 updates

Author: cryogenian

.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
+node_js: stable
 dist: trusty
 sudo: required
 node_js: 5

bower.json

@@ -22,7 +22,7 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-css": "^1.1.0",
-    "purescript-halogen": "^0.11.0"
+    "purescript-css": "^2.0.0",
+    "purescript-halogen": "^0.12.0"
   }
 }

package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
+  "license": "Apache-2.0",
   "scripts": {
-    "clean": "rimraf output && rimraf .pulp-cache",
+    "clean": "rm -rf output .pulp-cache",
     "build": "pulp build --censor-lib --strict"
   },
   "devDependencies": {
     "pulp": "^9.0.1",
-    "purescript": "^0.9.2",
-    "purescript-psa": "^0.3.9",
-    "rimraf": "^2.5.4"
+    "purescript": "0.10.1",
+    "purescript-psa": "^0.3.9"
   }
 }

src/Halogen/HTML/CSS.purs

@@ -7,59 +7,65 @@ module Halogen.HTML.CSS
 
 import Prelude
 
-import Data.Array (mapMaybe)
-import Data.Either (Either(), either)
-import Data.List (toUnfoldable, fromFoldable)
+import CSS.Property (Key, Value)
+import CSS.Render (render, renderedSheet, collect)
+import CSS.Stylesheet (CSS, Rule(..), runS)
+
+import Data.Array (mapMaybe, concatMap, singleton)
+import Data.Either (Either)
+import Data.Foldable (foldMap)
 import Data.Maybe (Maybe(..), fromMaybe)
-import Data.String (joinWith)
+import Data.Newtype (class Newtype)
 import Data.StrMap as SM
+import Data.String (joinWith)
 import Data.Tuple (Tuple(..))
 
-import CSS.Property (Key(), Value())
-import CSS.Render (render, renderedSheet, collect)
-import CSS.Stylesheet (CSS(), Rule(..), runS)
-
-import Halogen.HTML as H
-import Halogen.HTML.Core (HTML(), Prop(), class IsProp, prop, propName, attrName)
+import Halogen.HTML as HH
+import Halogen.HTML.Core (HTML, Prop, class IsProp, prop, propName, attrName)
+import Halogen.HTML.Elements as HE
 import Halogen.HTML.Properties as P
 
 -- | A newtype for CSS styles
 newtype Styles = Styles (SM.StrMap String)
 
--- | Unpack CSS styles
-runStyles :: Styles -> SM.StrMap String
-runStyles (Styles m) = m
+derive instance newtypeStyles ∷ Newtype Styles _
 
-instance stylesIsProp :: IsProp Styles where
-  toPropString _ _ (Styles m) = joinWith "; " $ (\(Tuple key value) -> key <> ": " <> value) <$> toUnfoldable (SM.toList m)
+instance stylesIsProp ∷ IsProp Styles where
+  toPropString _ _ (Styles m) =
+    joinWith "; " $ SM.foldMap (\key value → [key <> ": " <> value]) m
 
 -- | Render a set of rules as an inline style.
 -- |
 -- | For example:
 -- |
 -- | ```purescript
--- | H.div [ CSS.style do color red
+-- | HH.div [ CSS.style do color red
 -- |                      display block ]
 -- |       [ ... ]
 -- | ```
-style :: forall i. CSS -> Prop i
-style = prop (propName "style") (Just $ attrName "style") <<< Styles <<< rules <<< runS
+style ∷ ∀ i. CSS → Prop i
+style =
+  prop (propName "style") (Just $ attrName "style")
+    <<< Styles
+    <<< rules
+    <<< runS
   where
-  rules :: Array Rule -> SM.StrMap String
-  rules rs = SM.fromList (fromFoldable properties)
+  rules ∷ Array Rule → SM.StrMap String
+  rules rs = SM.fromFoldable properties
     where
-    properties :: Array (Tuple String String)
+    properties ∷ Array (Tuple String String)
     properties = mapMaybe property rs >>= collect >>> rights
 
-  property :: Rule -> Maybe (Tuple (Key Unit) Value)
+  property ∷ Rule → Maybe (Tuple (Key Unit) Value)
   property (Property k v) = Just (Tuple k v)
   property _              = Nothing
 
-  rights :: forall a b. Array (Either a b) -> Array b
-  rights = mapMaybe (either (const Nothing) Just)
+  rights ∷ ∀ a b. Array (Either a b) → Array b
+  rights = concatMap $ foldMap singleton
 
 -- | Render a set of rules as a `style` element.
-stylesheet :: forall p i. CSS -> HTML p i
-stylesheet css = H.style [ P.type_ "text/css" ] [ H.text content ]
+stylesheet ∷ ∀ p i. CSS → HTML p i
+stylesheet css =
+  HE.style [ P.type_ "text/css" ] [ HH.text content ]
   where
   content = fromMaybe "" $ renderedSheet $ render css

src/Halogen/HTML/CSS/Indexed.purs

@@ -2,14 +2,20 @@ module Halogen.HTML.CSS.Indexed where
 
 import Unsafe.Coerce (unsafeCoerce)
 
-import CSS.Stylesheet (CSS())
+import CSS.Stylesheet (CSS)
 
-import Halogen.HTML.Elements.Indexed (NoninteractiveNode())
-import Halogen.HTML.Properties.Indexed (IProp(), I())
+import Halogen.HTML.Elements.Indexed (NoninteractiveNode)
+import Halogen.HTML.Properties.Indexed (IProp, I)
 import Halogen.HTML.CSS as CSS
 
-style :: forall i r. CSS -> IProp (style :: I | r) i
-style = unsafeCoerce CSS.style
+style
+  ∷ ∀ i r. CSS → IProp (style ∷ I | r) i
+style =
+  unsafeCoerce CSS.style
 
-stylesheet :: forall p i. CSS -> NoninteractiveNode (media :: I, onError :: I, onLoad :: I, scoped :: I, mediaType :: I) p i
-stylesheet = unsafeCoerce CSS.stylesheet
+stylesheet
+  ∷ ∀ p i
+  . CSS
+  → NoninteractiveNode (media ∷ I, onError ∷ I, onLoad ∷ I, scoped ∷ I, mediaType ∷ I) p i
+stylesheet =
+  unsafeCoerce CSS.stylesheet