Merge pull request #11 from garyb/dom

Update dependencies, use purescript-dom

Author: jdegoes

bower.json

@@ -19,18 +19,19 @@
     "dist"
   ],
   "dependencies": {
-    "purescript-base": "^0.1.0",
-    "purescript-argonaut": "^0.8.0",
-    "purescript-globals": "^0.2.0",
-    "purescript-datetime": "^0.6.0",
-    "purescript-simple-dom": "6358414013eb3106d695e3e19488609f82d903e9",
-    "echarts": "~2.1.10"
+    "echarts": "~2.1.10",
+    "purescript-argonaut-codecs": "^0.2.0",
+    "purescript-argonaut-core": "^0.2.0",
+    "purescript-datetime": "^0.9.0",
+    "purescript-dom": "^0.2.6",
+    "purescript-globals": "^0.2.0"
   },
   "devDependencies": {
-    "purescript-signal": "^4.1.0",
-    "purescript-random": "^0.2.0"
+    "purescript-console": "^0.1.1",
+    "purescript-random": "^0.2.0",
+    "purescript-signal": "^4.1.0"
   },
   "resolutions": {
-    "purescript-lens": "^0.8.0"
+    "purescript-dom": "^0.2.4"
   }
 }

example/DynamicLineBar.purs

@@ -52,11 +52,11 @@ foreign import toLocaleTimeString :: JSDate -> String
 xTimeAxis = do
   curTime <- now
   let start = toEpochMilliseconds curTime
-  let mapfn = \i -> fromMaybe "" $ 
-                    replace onlyDigRgx  "" <$> 
+  let mapfn = \i -> fromMaybe "" $
+                    replace onlyDigRgx  "" <$>
                     toLocaleTimeString <$>
                     toJSDate <$>
-                    fromEpochMilliseconds (start - (Milliseconds (i * 2000)))
+                    fromEpochMilliseconds (start - (Milliseconds (toNumber i * 2000.0)))
 
   return $ mapfn <$> (1..10)
 
@@ -165,7 +165,7 @@ options = do
   d1 <- data1
   d2 <- data2
   return $ options_ xAxs d1 d2
-  
+
 
 dataStream =
   every 2000.0 ~> const do
@@ -175,10 +175,10 @@ dataStream =
     let lastData = precise 1.0 $
                    rnd1 * if round ((rnd2 * 10.0) `mod` 2.0) == 0.0
                           then 1.0 else -1.0
-    curTime <- now 
-    let axisData = 
-                   replace onlyDigRgx  "" $ 
-                   toLocaleTimeString $ 
+    curTime <- now
+    let axisData =
+                   replace onlyDigRgx  "" $
+                   toLocaleTimeString $
                    toJSDate curTime
 
 

example/Force4.purs

@@ -40,7 +40,7 @@ type EFNode =
     initial :: Tuple Number Number,
     fixY :: Boolean,
     fixX :: Boolean,
-    category :: Int 
+    category :: Int
   }
 
 
@@ -55,7 +55,7 @@ foreign import clientHeight :: forall e. String -> Eff e Number
 
 data MockData = MockData (Array EFNode) (Array EFLink)
 
-randomInRange :: Number -> Number -> Eff _ Number 
+randomInRange :: Number -> Number -> Eff _ Number
 randomInRange min max = do
   x <- random
   pure $ (max - min) * x + min
@@ -68,7 +68,7 @@ createRootNode depth = do
   rValue <- randomInRange constMinRadius constMaxRadius
   let x = width / 2.0 + (0.5 - rnd) * 200.0
   let y = (height - 20.0) * toNumber depth / (toNumber constMaxDepth + 1.0) + 20.0
-  
+
   pure { name: "ROOT_NODE"
        , value:  rValue
        , id: "root"
@@ -79,20 +79,20 @@ createRootNode depth = do
        , category: 2
        }
 
-    
+
 createNodeWithIndex :: forall e. String -> Int -> Eff (random :: RANDOM|e) EFNode
-createNodeWithIndex idx depth = 
+createNodeWithIndex idx depth =
   _{ id = idx
    , name = "NODE_" <> idx
    , category = if depth == constMaxDepth
                 then 1
                 else 0
    } <$> createRootNode depth
-               
+
 
 mkChild :: forall e. EFNode -> String ->
            Eff (random::RANDOM|e) (Tuple EFNode EFLink)
-mkChild node idx = do 
+mkChild node idx = do
   child <- createNodeWithIndex idx (node.depth + one)
   let link = {source: node.name, target: child.name, weight: 1.0}
   return $ Tuple child link
@@ -104,7 +104,7 @@ mkChildren node = do
     mkChild node $ node.id <> ":" <> show i
 
 forceMockThreeDataI :: Array (Tuple EFNode EFLink) -> MockData ->
-                       Int -> Eff _ MockData 
+                       Int -> Eff _ MockData
 forceMockThreeDataI current accum 0 = return accum
 forceMockThreeDataI current accum n = do
   let nextAccum = foldl (\(MockData nodes links) (Tuple node link) ->
@@ -120,7 +120,7 @@ forceMockThreeData = do
   children <- mkChildren root
   forceMockThreeDataI children (MockData [root] []) constMaxDepth
 
-nodes :: Eff _ _ 
+nodes :: Eff _ _
 nodes = return []
 links :: Eff _ _
 links = return []
@@ -148,7 +148,7 @@ itemColor color = Just $ ItemStyle itemStyleDefault {
      }
   }
 
-mkOptions nodes links = Option $ optionDefault {
+mkOptions nodes' links' = Option $ optionDefault {
   series = Just $ Just <$> [
      ForceSeries {
         common: universalSeriesDefault{
@@ -170,25 +170,25 @@ mkOptions nodes links = Option $ optionDefault {
               itemStyle = itemColor "#af0000"
               }
             ],
-          nodes = Just $ nodeNormalize <$> nodes,
-          links = Just $ linkNormalize <$> links,
+          nodes = Just $ nodeNormalize <$> nodes',
+          links = Just $ linkNormalize <$> links',
           minRadius = Just constMinRadius,
           maxRadius = Just constMaxRadius
           }
-        
+
         }
      ]
   }
 
-  
+
 
 
 options :: forall e. Eff (random::RANDOM|e) _
 options = do
-  mockdata <- forceMockThreeData 
+  mockdata <- forceMockThreeData
   case mockdata of
-    MockData nodes links -> do
-      return $ mkOptions nodes links
+    MockData nodes' links' -> do
+      return $ mkOptions nodes' links'
 
 force4 id = do
   mbEl <- getElementById id
@@ -198,4 +198,4 @@ force4 id = do
       opts <- options
       chart <- init Nothing el >>= setOption opts true
       return unit
-      
+

example/Loading.purs

@@ -4,7 +4,7 @@ import Prelude
 import Control.Monad.Eff.Console (print)
 import Data.Array hiding (init, zip)
 import Data.Maybe
-import Data.Tuple 
+import Data.Tuple
 import Control.Monad.Eff
 import Control.Monad.Eff.Random
 
@@ -38,7 +38,7 @@ allEffects :: Array L.LoadingEffect
 allEffects = [L.Spin, L.Bar, L.Ring, L.Whirling, L.DynamicLine, L.Bubble]
 
 effect :: L.LoadingEffect -> L.LoadingOption
-effect eff = L.LoadingOption $ 
+effect eff = L.LoadingOption $
   L.loadingOptionDefault{
     text = Just $ "effect",
     effect = Just eff,
@@ -60,7 +60,7 @@ series true = [
        name = Just "second"
        },
     lineSeries: lineSeriesDefault {
-      "data" = Just $ simpleData <$> [2.6, 5.9, 9.0, 
+      "data" = Just $ simpleData <$> [2.6, 5.9, 9.0,
                                       26.4, 28.7, 70.7, 175.6, 182.2, 48.7,
                                       18.8, 6.0, 2.3]
       }
@@ -81,7 +81,7 @@ series false = [
        name = Just "second"
        },
     barSeries: barSeriesDefault {
-      "data" = Just $ simpleData <$> [2.6, 5.9, 9.0, 
+      "data" = Just $ simpleData <$> [2.6, 5.9, 9.0,
                                       26.4, 28.7, 70.7, 175.6, 182.2, 48.7,
                                       18.8, 6.0, 2.3]
       }
@@ -130,15 +130,15 @@ options i = Option $ optionDefault {
 data ChartSignal a = StartLoading L.LoadingOption | StopLoading a
 
 
-dataStream :: Signal (Eff _ (ChartSignal _))
+dataStream :: forall eff. Signal (Eff (random :: Control.Monad.Eff.Random.RANDOM | eff) (ChartSignal Option))
 dataStream =
   foldp (\_ curstateE -> do
           curstate <- curstateE
           case curstate of
             StartLoading _ -> do
               effAndI <- randomInList allEffects
               case effAndI of
-                Tuple eff i -> 
+                Tuple eff i ->
                   return $ StopLoading $ options i
             StopLoading _ -> do
               effAndI <- randomInList allEffects
@@ -148,7 +148,7 @@ dataStream =
   (return $ StartLoading (effect L.Spin))
   (every 2000.0)
 
-  
+
 loading id = do
   mbEl <- getElementById id
   case mbEl of
@@ -161,6 +161,6 @@ loading id = do
         case content of
           StartLoading loadOptions -> L.showLoading loadOptions chart
                                       >>= \_ -> return unit
-          StopLoading options -> 
-            setOption options true chart >>= L.hideLoading
+          StopLoading options' ->
+            setOption options' true chart >>= L.hideLoading
             >>= \_ -> return unit

example/Main.purs

@@ -1,38 +1,42 @@
 module Main where
 
 import Prelude
-import Utils
-import Line4 (line4)
-import Scatter3 (scatter3)
-import K (k)
-import Radar3 (radar3)
+
+import DOM.Node.Types (ElementId(..))
+
 import Chord2 (chord2)
+import Connect (connectM)
+import Control.Monad.Eff (Eff())
+import DynamicLineBar (dynamicLineBar)
+import ECharts.Effects
+import EventRiver1 (eventRiver)
+import Events (events)
 import Force4 (force4)
-import Map11 (map11)
+import Funnel2 (funnel2)
 import Gauge4 (gauge4)
-import Funnel2 (funnel2) 
-import EventRiver1 (eventRiver) 
-import DynamicLineBar (dynamicLineBar)
+import K (k)
+import Line4 (line4)
 import Loading (loading)
-import Events (events) 
-import Connect (connectM)
+import Map11 (map11)
 import Mix2Safe (mix2safe)
+import Radar3 (radar3)
+import Scatter3 (scatter3)
+import Utils
 
 main = onLoad $ do
-  line4 "line4"
-  scatter3 "scatter3"
-  k "k"
-  radar3 "radar3"
-  chord2 "chord2"
-  force4 "force4"
-  map11 "map11"
-  gauge4 "gauge4"
-  funnel2 "funnel2"
-  eventRiver "event-river"
-  
-  dynamicLineBar "dynamic-line-bar"
-  loading "loading"
-  events "events"
-  connectM "connect1" "connect2"
-  mix2safe "mix2safe"
+  line4 (ElementId "line4")
+  scatter3 (ElementId "scatter3")
+  k (ElementId "k")
+  radar3 (ElementId "radar3")
+  chord2 (ElementId "chord2")
+  force4 (ElementId "force4")
+  map11 (ElementId "map11")
+  gauge4 (ElementId "gauge4")
+  funnel2 (ElementId "funnel2")
+  eventRiver (ElementId "event-river")
 
+  dynamicLineBar (ElementId "dynamic-line-bar")
+  loading (ElementId "loading")
+  events (ElementId "events")
+  connectM (ElementId "connect1") (ElementId "connect2")
+  mix2safe (ElementId "mix2safe")