From 136d51c51462cd1a05326e15ead4238ad9f98061 Mon Sep 17 00:00:00 2001
From: Maxim Zimaliev <zimaliev@gmail.com>
Date: Mon, 9 Oct 2017 16:30:46 +0300
Subject: [PATCH] updated echarts

---
 bower.json               |  5 ++++-
 example/src/Main.purs    |  5 +++--
 example/src/Options.purs | 14 +++++++-------
 src/Halogen/ECharts.purs |  6 ++----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/bower.json b/bower.json
index 89c68fb..1b4b8f0 100644
--- a/bower.json
+++ b/bower.json
@@ -17,10 +17,13 @@
   "dependencies": {
     "purescript-halogen": "^2.2.0",
     "purescript-halogen-css": "^6.0.0",
-    "purescript-echarts": "^7.0.0"
+    "purescript-echarts": "^8.0.0"
   },
   "devDependencies": {
     "purescript-debug": "^3.0.0",
     "purescript-random": "^3.0.0"
+  },
+  "resolutions": {
+    "purescript-aff": "^3.0.0"
   }
 }
diff --git a/example/src/Main.purs b/example/src/Main.purs
index 1636f9d..2034b55 100644
--- a/example/src/Main.purs
+++ b/example/src/Main.purs
@@ -10,6 +10,7 @@ import Data.Array ((!!), length, snoc, sort, reverse, head, filter)
 import Data.Foldable (for_)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Tuple.Nested ((/\))
+import ECharts.Monad (interpret)
 import Halogen as H
 import Halogen.Aff (runHalogenAff, awaitBody)
 import Halogen.ECharts as EC
@@ -81,7 +82,7 @@ eval ∷ Query ~> DSL
 eval (SetRandomOption ix next) = do
   mbopt ← liftEff $ randomInArray options
   for_ mbopt \opt →
-    void $ H.query ix $ H.action $ EC.Reset opt
+    void $ H.query ix $ H.action $ EC.Reset $ interpret opt
   pure next
 eval (AddChart next) = do
   H.modify (\x → x{arr = snoc x.arr (maybe 0 (add one) $ head $ reverse $ sort x.arr)})
@@ -92,7 +93,7 @@ eval (RemoveChart ix next) = do
 eval (HandleEChartsMessage ix EC.Initialized next) = do
   mbopt ← liftEff $ randomInArray options
   for_ mbopt \opt →
-    void $ H.query ix $ H.action $ EC.Set opt
+    void $ H.query ix $ H.action $ EC.Set $ interpret opt
   pure next
 eval (HandleEChartsMessage ix (EC.EventRaised evt) next) = do
   pure next
diff --git a/example/src/Options.purs b/example/src/Options.purs
index ce2c88a..193a24b 100644
--- a/example/src/Options.purs
+++ b/example/src/Options.purs
@@ -7,9 +7,9 @@ import Data.Foldable as F
 import ECharts.Commands as E
 import ECharts.Types as ET
 import ECharts.Types.Phantom as ETP
-import ECharts.Monad (DSL)
+import ECharts.Monad (DSL')
 
-lineOptions ∷ DSL ETP.OptionI
+lineOptions ∷ DSL' ETP.OptionI
 lineOptions = do
   E.tooltip E.triggerAxis
   E.legend do
@@ -65,7 +65,7 @@ lineOptions = do
       E.items $ map ET.numItem [ 820.0, 932.0, 901.0, 934.0, 1290.0, 1330.0, 1320.0 ]
 
 
-graphOptions ∷ DSL ETP.OptionI
+graphOptions ∷ DSL' ETP.OptionI
 graphOptions = do
   E.title $ E.text "Graph"
   E.tooltip $ pure unit
@@ -135,7 +135,7 @@ graphOptions = do
           E.targetName "four"
 
 
-radarOptions ∷ DSL ETP.OptionI
+radarOptions ∷ DSL' ETP.OptionI
 radarOptions = do
   E.radar do
     E.indicators do
@@ -167,7 +167,7 @@ radarOptions = do
         E.name "Actual"
         E.values [ 5000.0, 14000.0, 28000.0, 31000.0, 42000.0, 21000.0 ]
 
-kOptions ∷ DSL ETP.OptionI
+kOptions ∷ DSL' ETP.OptionI
 kOptions = do
   E.xAxis do
     E.axisType ET.Category
@@ -187,7 +187,7 @@ kOptions = do
       ]
 
 
-funnelOptions ∷ DSL ETP.OptionI
+funnelOptions ∷ DSL' ETP.OptionI
 funnelOptions = do
   E.series $ E.funnel do
     E.ascending
@@ -206,7 +206,7 @@ funnelOptions = do
         E.value 123.0
 
 
-options ∷ Array (DSL ETP.OptionI)
+options ∷ Array (DSL' ETP.OptionI)
 options =
   [ lineOptions
   , graphOptions
diff --git a/src/Halogen/ECharts.purs b/src/Halogen/ECharts.purs
index 4bf943f..facad00 100644
--- a/src/Halogen/ECharts.purs
+++ b/src/Halogen/ECharts.purs
@@ -25,10 +25,8 @@ import Data.Traversable (for)
 import Data.Tuple.Nested (type (/\), (/\))
 import ECharts.Chart as EC
 import ECharts.Event as EE
-import ECharts.Monad as EM
 import ECharts.Theme as ETheme
 import ECharts.Types as ET
-import ECharts.Types.Phantom as ETP
 import Halogen as H
 import Halogen.HTML as HH
 import Halogen.HTML.CSS (style)
@@ -45,8 +43,8 @@ data EChartsQuery a
   = Init (Maybe ETheme.Theme) a
   | HandleEvent ET.EChartsEvent (H.SubscribeStatus → a)
   | Dispose a
-  | Set (EM.DSL ETP.OptionI) a
-  | Reset (EM.DSL ETP.OptionI) a
+  | Set ET.Option a
+  | Reset ET.Option a
   | Resize a
   | Clear a
   | SetDimensions { width ∷ Int, height ∷ Int } a