[MERGE] and making Annuaire working again.

CONTRIBUTING.md

+#+Title: Contributing
+
+yarn first then psc-package are used to manage dependencies
+
+to build use ./build
+to rebuild (after a major upgrade) use ./rebuild
+to add a new dependency: psc-package install PACKAGE
+
+use git, commit and pull request :)

README.md

+# Gargantext Purescript
+
+## About this project
+
+Gargantext is a collaborative web platform for the exploration of sets
+of unstructured documents. It combines tools from natural language
+processing, text-mining, complex networks analysis and interactive data
+visualization to pave the way toward new kinds of interactions with your
+digital corpora.
+
+This software is a free software, developed by the CNRS Complex Systems
+Institute of Paris Île-de-France (ISC-PIF) and its partners.
+
+## Installation of this library
+
+### Dependencies warning
+This library purescript-gargantext is the Front End part of Gargantext.
+you need the backend (haskell-gargantext) installation too.
+
+### Installation steps
+
+1. Add nodes_modules/.bin to your path
+2. Execute ./build
+
+## Note to the contributors
+
+Please follow CONTRIBUTING.md

bower.json

@@ -8,7 +8,7 @@
   ],
   "dependencies": {
     "purescript-console": "^4.1.0",
-    "purescript-thermite": "https://github.com/np/purescript-thermite.git#d7395aec9ff4e7b8f820e882b4b07ed15c4f804d",
+    "purescript-thermite": "https://github.com/np/purescript-thermite.git#cf194360c8ee440978a2b342382fc3fddc65b39e",
     "purescript-affjax": "^7.0.0",
     "purescript-routing": "^8.0.0",
     "purescript-argonaut": "^4.0.1",
@@ -19,6 +19,7 @@
     "purescript-psci-support": "^4.0.0"
   },
   "resolutions": {
-    "purescript-react": "exports"
+    "purescript-react": "exports",
+    "purescript-profunctor-lenses": "^4.0.0"
   }
 }

build

+#!/bin/bash
+
+yarn && yarn psc-package install && yarn pulp --psc-package build && yarn pulp --psc-package browserify --to dist/bundle.js

dist/css/Login.css

@@ -78,3 +78,88 @@ logoSmall {
     background-color : blue;
     color: white;
 }
+
+
+li#rename  #rename-a{
+    display : none;
+    position : absolute;
+    left : 125px;
+}
+
+
+#rename-tooltip {
+    position : absolute;
+    left : 96px;
+    top:-64px;
+    background-color: white;
+    z-index: 1000;
+
+}
+
+li a#rename {
+    display:none;
+    position:absolute;
+    text-decoration:none;
+    left: 26px;
+}
+
+li:hover a#rename {
+    display:block;
+}
+
+.glyphitem {top: 0;
+
+display: inline-block;
+
+float: right;
+
+opacity: 0.6;
+
+padding-right: 5px;
+
+cursor: pointer;
+
+transition: transform 0.1s ease-out 0s;
+
+font-size: 15px;
+
+text-align: center;
+  }
+
+.glyphitem:hover {
+
+    display: inline-block;
+    opacity: 1;
+    transform: scale(1.4);
+}
+
+#rename-tooltip:hover {
+    border:none;
+}
+
+
+
+#arrow {
+    width: 0;
+    height: 0;
+    border-top: 10px solid transparent;
+    border-bottom: 10px solid transparent;
+
+    border-right:10px solid darkgray;
+    position : relative;
+    top: 55px;
+    left: -9px;
+}
+
+
+#rename-tooltip a:hover
+{
+    text-decoration:none;
+}
+
+#sp-container 
+{ -webkit-transition: width 2s; /* For Safari 3.1 to 6.0 */
+    transition: width 2s;
+
+}
+

install

+#!/bin/bash
+
+echo "Upgrading nodeJS"
+sudo npm cache clean -f
+sudo npm install -g n
+sudo n stable
+sudo n latest
+
+echo "Installing yarn"
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+sudo apt update
+sudo apt install yarn
+
+./build
+

package.json

@@ -40,6 +40,7 @@
         "babelify": "^8.0.0",
         "bower": "^1.8.4",
         "http-server": "^0.11.1",
+        "psc-package": "^0.3.2",
         "pulp": "^12.3.0",
         "purescript": "^0.12.0"
     }

psc-package.json

+{
+  "name": "gargantext",
+  "set": "master",
+  "source": "https://github.com/np/package-sets.git",
+  "depends": [
+    "psci-support",
+    "css",
+    "generics-rep",
+    "routing",
+    "foreign-object",
+    "argonaut",
+    "effect",
+    "web-html",
+    "thermite",
+    "integers",
+    "random",
+    "affjax",
+    "console",
+    "prelude"
+  ]
+}

rebuild

 #!/bin/bash
 
-rm -rf output bower_components node_modules
-bower install && yarn install && pulp build && pulp browserify --to dist/bundle.js
+rm -rf .psc-package output bower_components node_modules
+./build

repl

+#!/bin/bash
+pulp --psc-package repl

src/.psc-ide-port

+15747
\ No newline at end of file

src/Gargantext/Components/GraphExplorer/Types.purs

@@ -88,3 +88,5 @@ t' :: Node -> Legend
 t' (Node r) = Legend { id_ : clustDefault, label : r.label}
   where
     (Cluster {clustDefault}) = r.attributes
+
+

src/Gargantext/Components/Loader.purs

 module Gargantext.Components.Loader where
 
+import Control.Monad.Cont.Trans (lift)
 import Data.Maybe (Maybe(..))
-import Data.Either (Either(..))
-import Data.Traversable (traverse_)
 import React as React
-import React (ReactClass)
+import React (ReactClass, Children)
 import Gargantext.Prelude
-import Effect.Aff (Aff, launchAff, launchAff_, makeAff, nonCanceler, killFiber)
-import Effect.Exception (error)
+import Effect (Effect)
+import Effect.Aff (Aff)
 
-type InnerProps a b =
-  { path     :: a
-  , loaded   :: Maybe b
-  , children :: React.Children
-  }
+import Thermite (Render, PerformAction, simpleSpec, modifyState_, createReactSpec)
 
-type Props a b = { path      :: a
-                 , component :: ReactClass (InnerProps a b)
-                 }
+data Action path = ForceReload | SetPath path
 
-createLoaderClass :: forall a b
+type InnerPropsRow path loaded row =
+  ( path     :: path
+  , loaded   :: loaded
+  , dispatch :: Action path -> Effect Unit
+  | row
+  )
+
+type InnerProps path loaded row = Record (InnerPropsRow path loaded row)
+
+type InnerClass path loaded = ReactClass (InnerProps path loaded (children :: Children))
+
+type PropsRow path loaded row =
+  ( path      :: path
+  , component :: InnerClass path loaded
+  | row
+  )
+
+type Props path loaded = Record (PropsRow path loaded (children :: Children))
+
+type Props' path loaded = Record (PropsRow path loaded ())
+
+type State path loaded = { currentPath :: path, loaded :: Maybe loaded }
+
+createLoaderClass' :: forall path loaded props
+                    . Eq path
+                   => String
+                   -> (path -> Aff loaded)
+                   -> Render (State path loaded) {path :: path | props} (Action path)
+                   -> ReactClass { path :: path, children :: Children | props }
+createLoaderClass' name loader render =
+  React.component name
+    (\this -> do
+       s <- spec this
+       pure { state: s.state
+            , render: s.render
+            , componentDidMount: dispatcher this ForceReload
+            , componentDidUpdate: \_prevProps {currentPath} _snapshot -> do
+                {path} <- React.getProps this
+                -- This guard is the same as in performAction (SetPath ...),
+                -- however we need it here to avoid potential infinite loops.
+                -- https://reactjs.org/docs/react-component.html#componentdidupdate
+                when (path /= currentPath) do
+                  dispatcher this (SetPath path)
+            })
+  where
+    initialState {path} = {currentPath: path, loaded: Nothing}
+
+    performAction :: PerformAction (State path loaded) {path :: path | props} (Action path)
+    performAction ForceReload _ {currentPath} = do
+      loaded <- lift $ loader currentPath
+      modifyState_ $ _ { loaded = Just loaded }
+    performAction (SetPath newPath) _ {currentPath} =
+      when (newPath /= currentPath) do
+        loaded <- lift $ loader newPath
+        modifyState_ $ _ { currentPath = newPath, loaded = Just loaded }
+
+    {spec, dispatcher} = createReactSpec (simpleSpec performAction render) initialState
+
+type LoaderClass path loaded =
+  ReactClass (Record (PropsRow path loaded (children :: Children)))
+
+createLoaderClass :: forall path loaded
+                   . Eq path
+                  => String
+                  -> (path -> Aff loaded)
+                  -> LoaderClass path loaded
+createLoaderClass name loader =
+    createLoaderClass' name loader render
+  where
+    render :: Render (State path loaded) (Props' path loaded) (Action path)
+    render _ _ {loaded: Nothing} _ =
+      -- TODO load spinner
+      []
+    render dispatch {component} {currentPath, loaded: Just loaded} c =
+      [React.createElement component {path: currentPath, loaded, dispatch} c]
+
+{-
+createLoaderClass :: forall path loaded
                    . String
-                  -> (a -> Aff b)
-                  -> ReactClass (Props a b)
+                  -> (path -> Aff loaded)
+                  -> ReactClass (Props path loaded)
 createLoaderClass name loader = React.component name mk
   where
     mk this =
@@ -49,3 +119,4 @@ createLoaderClass name loader = React.component name mk
             {loaded} <- React.getState this
             pure $ React.createElement component {path, loaded} []
         }
+-}

src/Gargantext/Components/Table.purs

 module Gargantext.Components.Table where
 
-import Control.Monad.Cont.Trans (lift)
 import Data.Array (filter)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Either (Either(..))
 import Effect (Effect)
-import Effect.Aff (Aff)
-import React as React
+import Effect.Class (liftEffect)
 import React (ReactElement, ReactClass, Children, createElement)
-import React.DOM (a, b, b', div, option, select, span, table, tbody, td, text, th, thead, tr)
-import React.DOM.Props (className, href, onChange, onClick, scope, selected, value)
-import Thermite (PerformAction, Render, Spec, modifyState, simpleSpec,
-    createReactSpec, StateCoTransformer)
+import React.DOM (a, b, b', p, i, h3, hr, div, option, select, span, table, tbody, td, text, th, thead, tr)
+import React.DOM.Props (className, href, onChange, onClick, scope, selected, value, style)
+import Thermite (PerformAction, Render, Spec, modifyState_, simpleSpec, StateCoTransformer, createClass)
 import Unsafe.Coerce (unsafeCoerce)
 
 import Gargantext.Prelude
 
+type TableContainerProps =
+  { pageSizeControl     :: ReactElement
+  , pageSizeDescription :: ReactElement
+  , paginationLinks     :: ReactElement
+  , tableHead           :: ReactElement
+  , tableBody           :: Array ReactElement
+  }
+
 type Rows = Array { row    :: Array ReactElement
                   , delete :: Boolean
                   }
 
-type LoadRows = { offset :: Int, limit :: Int } -> Aff Rows
+type OrderBy = Maybe (OrderByDirection ColumnName)
+
+type Params = { offset :: Int, limit :: Int, orderBy :: OrderBy }
+
+newtype ColumnName = ColumnName String
+
+derive instance eqColumnName :: Eq ColumnName
+
+columnName :: ColumnName -> String
+columnName (ColumnName c) = c
+
+data OrderByDirection a = ASC a | DESC a
+
+derive instance eqOrderByDirection :: Eq a => Eq (OrderByDirection a)
 
 type Props' =
-  ( title        :: String
-  , colNames     :: Array String
+  ( colNames     :: Array ColumnName
   , totalRecords :: Int
-  , loadRows     :: LoadRows
+  , setParams    :: Params -> Effect Unit
+  , rows         :: Rows
+  , container    :: TableContainerProps -> Array ReactElement
   )
 
 type Props = Record Props'
 
 type State =
-  { rows        :: Maybe Rows
-  , currentPage :: Int
+  { currentPage :: Int
   , pageSize    :: PageSizes
---, tree        :: FTree
+  , orderBy     :: OrderBy
   }
 
 initialState :: State
 initialState =
-  { rows         : Nothing
-  , currentPage  : 1
+  { currentPage  : 1
   , pageSize     : PS10
---, tree         : exampleTree
+  , orderBy      : Nothing
   }
 
+initialParams :: Params
+initialParams = stateParams initialState
+
 data Action
   = ChangePageSize PageSizes
   | ChangePage     Int
+  | ChangeOrderBy  OrderBy
 
 type ChangePageAction = Int -> Effect Unit
 
@@ -60,63 +81,107 @@ changePageSize ps td =
      , currentPage   = 1
      }
 
+-- TODO: Not sure this is the right place for this function.
+renderTableHeaderLayout :: { title :: String
+                           , desc  :: String
+                           , query :: String
+                           , date  :: String
+                           , user  :: String
+                           } -> Array ReactElement
+renderTableHeaderLayout {title, desc, query, date, user} =
+  [ div [className "row"]
+    [ div [className "col-md-3"] [ h3 [] [text title] ]
+    , div [className "col-md-9"] [ hr [style {height : "2px",backgroundColor : "black"}] ]
+    ]
+  , div [className "row"] [ div [className "jumbotron1", style {padding : "12px 0px 20px 12px"}]
+        [ div [ className "col-md-8 content"]
+              [ p [] [ i [className "fa fa-globe"] []
+                     , text $ " " <> desc
+                     ]
+              , p [] [ i [className "fab fa-searchengin"] []
+                     , text $ " " <> query
+                     ]
+              ]
+        , div [ className "col-md-4 content"]
+              [ p [] [ i [className "fa fa-calendar"] []
+                     , text $ " " <> date
+                     ]
+              , p [] [ i [className "fa fa-user"] []
+                     , text $ " " <> user
+                     ]
+              ]
+        ]
+    ]
+  ]
+
 tableSpec :: Spec State Props Action
 tableSpec = simpleSpec performAction render
   where
     modifyStateAndReload :: (State -> State) -> Props -> State -> StateCoTransformer State Unit
-    modifyStateAndReload f {loadRows} state = do
-      void $ modifyState f
-      loadAndSetRows {loadRows} $ f state
+    modifyStateAndReload f {setParams} state = do
+      modifyState_ f
+      liftEffect $ setParams $ stateParams $ f state
 
     performAction :: PerformAction State Props Action
     performAction (ChangePageSize ps) =
       modifyStateAndReload $ changePageSize ps
     performAction (ChangePage p) =
       modifyStateAndReload $ _ { currentPage = p }
+    performAction (ChangeOrderBy mc) =
+      modifyStateAndReload $ _ { orderBy = mc }
+
+    renderColHeader :: (OrderBy -> Effect Unit)
+                    -> OrderBy
+                    -> ColumnName -> ReactElement
+    renderColHeader changeOrderBy currentOrderBy c =
+      th [scope "col"] [ b' cs ]
+      where
+        lnk mc = effectLink (changeOrderBy mc)
+        cs :: Array ReactElement
+        cs =
+          case currentOrderBy of
+            Just (ASC d)  | c == d -> [lnk (Just (DESC c)) "ASC ",  lnk Nothing (columnName c)]
+            Just (DESC d) | c == d -> [lnk (Just (ASC  c)) "DESC ", lnk Nothing (columnName c)]
+            _ -> [lnk (Just (ASC c)) (columnName c)]
 
     render :: Render State Props Action
-    render dispatch {title, colNames, totalRecords}
-                    {pageSize, currentPage, rows} _ =
-      let
+    render dispatch {container, colNames, totalRecords, rows}
+                    {pageSize, currentPage, orderBy} _ =
+      container
+        { pageSizeControl: sizeDD pageSize dispatch
+        , pageSizeDescription: textDescription currentPage pageSize totalRecords
+        , paginationLinks: pagination (dispatch <<< ChangePage) totalPages currentPage
+        , tableHead:
+            tr [] (renderColHeader (dispatch <<< ChangeOrderBy) orderBy <$> colNames)
+        , tableBody:
+            map (tr [] <<< map (\c -> td [] [c]) <<< _.row) rows
+        }
+      where
         ps = pageSizes2Int pageSize
         totalPages = (totalRecords / ps) + min 1 (totalRecords `mod` ps)
-      in
-      [ div [className "row"]
-        [ div [className "col-md-1"] [b [] [text title]]
-        , div [className "col-md-2"] [sizeDD pageSize dispatch]
-        , div [className "col-md-3"] [textDescription currentPage pageSize totalRecords]
-        , div [className "col-md-3"] [pagination (dispatch <<< ChangePage) totalPages currentPage]
-              ]
-      , table [ className "table"]
-        [ thead [className "thead-dark"]
-                [tr [] ((\colName -> th [scope "col"] [ b' [text colName]]) <$> colNames)]
-        , tbody [] $ map (tr [] <<< map (\c -> td [] [c]) <<< _.row)
-                         (maybe [] identity rows)
-                      -- TODO display a loading spinner when rows == Nothing
-                      -- instead of an empty list of results.
-        ]
-      ]
 
-loadAndSetRows :: {loadRows :: LoadRows} -> State -> StateCoTransformer State Unit
-loadAndSetRows {loadRows} {pageSize, currentPage} = do
-  let limit = pageSizes2Int pageSize
-      offset = limit * (currentPage - 1)
-  rows <- lift $ loadRows {offset, limit}
-  void $ modifyState (_ { rows = Just rows })
+defaultContainer :: {title :: String} -> TableContainerProps -> Array ReactElement
+defaultContainer {title} props =
+  [ div [className "row"]
+    [ div [className "col-md-1"] [b [] [text title]]
+    , div [className "col-md-2"] [props.pageSizeControl]
+    , div [className "col-md-3"] [props.pageSizeDescription]
+    , div [className "col-md-3"] [props.paginationLinks]
+    ]
+  , table [ className "table"]
+    [ thead [className "thead-dark"] [ props.tableHead ]
+    , tbody [] props.tableBody
+    ]
+  ]
+
+stateParams :: State -> Params
+stateParams {pageSize, currentPage, orderBy} = {offset, limit, orderBy}
+  where
+    limit = pageSizes2Int pageSize
+    offset = limit * (currentPage - 1)
 
 tableClass :: ReactClass {children :: Children | Props'}
-tableClass =
-  React.component "Table"
-    (\this -> do
-       {state, render} <- spec this
-       pure { state, render
-            , componentDidMount: do
-                {loadRows} <- React.getProps this
-                state' <- React.getState this
-                dispatcher' this $ loadAndSetRows {loadRows} state'
-            })
-  where
-    { spec, dispatcher' } = createReactSpec tableSpec initialState
+tableClass = createClass "Table" tableSpec (const initialState)
 
 tableElt :: Props -> ReactElement
 tableElt props = createElement tableClass props []
@@ -131,7 +196,7 @@ sizeDD ps d
 textDescription :: Int -> PageSizes -> Int -> ReactElement
 textDescription currPage pageSize totalRecords
   =  div [className "row1"]
-          [ div [className ""]
+          [ div [className ""] -- TODO or col-md-6 ?
                 [ text $ "Showing " <> show start <> " to " <> show end <> " of " <> show totalRecords ]
           ]
     where
@@ -139,6 +204,9 @@ textDescription currPage pageSize totalRecords
       end' = currPage * pageSizes2Int pageSize
       end  = if end' > totalRecords then totalRecords else end'
 
+effectLink :: Effect Unit -> String -> ReactElement
+effectLink eff msg = a [onClick $ const eff] [text msg]
+
 pagination :: ChangePageAction -> Int -> Int -> ReactElement
 pagination changePage tp cp
   = span [] $
@@ -154,44 +222,20 @@ pagination changePage tp cp
     where
       prev = if cp == 1 then
                text " Previous "
-               else
-               span []
-               [ text " "
-               , a [ href "javascript:void()"
-                   , onClick (\e -> changePage $ cp - 1)
-                   ] [text "Previous"]
-               , text " "
-               ]
+             else
+               changePageLink (cp - 1) "Previous"
       next = if cp == tp then
                text " Next "
-               else
-               span []
-               [ text " "
-               , a [ href "javascript:void()"
-                   , onClick (\e -> changePage $ cp + 1)
-                   ] [text "Next"]
-               , text " "
-               ]
+             else
+               changePageLink (cp + 1) "Next"
       first = if cp == 1 then
                 text ""
-                else
-                span []
-                [ text " "
-                , a [ href "javascript:void()"
-                    , onClick (\e -> changePage 1)
-                    ] [text "1"]
-                , text " "
-                ]
+              else
+                changePageLink' 1
       last = if cp == tp then
                text ""
              else
-               span []
-               [ text " "
-               , a [ href "javascript:void()"
-                   , onClick (\e -> changePage tp)
-                   ] [text $ show tp]
-               , text " "
-               ]
+               changePageLink' tp
       ldots = if cp >= 5 then
                 text " ... "
                 else
@@ -200,18 +244,18 @@ pagination changePage tp cp
                 text " ... "
                 else
                 text ""
-      lnums = map (\i -> fnmid changePage i) $ filter (1  < _) [cp - 2, cp - 1]
-      rnums = map (\i -> fnmid changePage i) $ filter (tp > _) [cp + 1, cp + 2]
+      lnums = map changePageLink' $ filter (1  < _) [cp - 2, cp - 1]
+      rnums = map changePageLink' $ filter (tp > _) [cp + 1, cp + 2]
 
-fnmid :: ChangePageAction -> Int -> ReactElement
-fnmid changePage i
-  = span []
-    [ text " "
-    , a [ href "javascript:void()"
-        , onClick (\e -> changePage i)
-        ] [text $ show i]
-    , text " "
-    ]
+      changePageLink :: Int -> String -> ReactElement
+      changePageLink i s = span []
+          [ text " "
+          , effectLink (changePage i) s
+          , text " "
+          ]
+
+      changePageLink' :: Int -> ReactElement
+      changePageLink' i = changePageLink i (show i)
 
 data PageSizes = PS10 | PS20 | PS50 | PS100
 

src/Gargantext/Components/Tree.purs

 module Gargantext.Components.Tree where
 
+import Prelude hiding (div)
+import Unsafe.Coerce
+
+import Affjax (defaultRequest, printResponseFormatError, request)
+import Affjax.RequestBody (RequestBody(..))
+import Affjax.ResponseFormat as ResponseFormat
+import CSS (backgroundColor, borderRadius, boxShadow, justifyContent, marginTop)
 import Control.Monad.Cont.Trans (lift)
-import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject, (.?), (:=), (~>))
+import Data.Argonaut (class DecodeJson, class EncodeJson, Json, decodeJson, encodeJson, jsonEmptyObject, (.?), (:=), (~>))
+import Data.Argonaut.Core (Json)
+import Data.Either (Either(..))
+import Data.HTTP.Method (Method(..))
+import Data.Maybe (Maybe(..))
 import Data.Newtype (class Newtype)
-import Data.Traversable (traverse)
 import Effect (Effect)
 import Effect.Aff (Aff)
+import Effect.Class (liftEffect)
+import Effect.Console (log)
 import Prelude (identity)
-import React (ReactElement)
-import React.DOM (a, button, div, h5, i, input, li, text, ul)
-import React.DOM.Props (Props, _type, className, href, onClick, onInput, placeholder, style, value)
-import Thermite (PerformAction, Render, Spec, modifyState, simpleSpec)
-import Unsafe.Coerce (unsafeCoerce)
+import React (ReactClass, ReactElement)
+import React as React
+import React.DOM (a, button, div, h5, i, input, li, span, text, ul)
+import React.DOM.Props (_id, _type, className, href, title, onClick, onInput, placeholder, style, defaultValue, _data)
+import React.DOM.Props as DOM
+import Thermite (PerformAction, Render, Spec, createClass, defaultPerformAction, defaultRender, modifyState_, simpleSpec)
 
-import Gargantext.Prelude
-import Gargantext.Config.REST (get, put, post, delete)
-import Gargantext.Config (NodeType(..), toUrl, End(..), defaultRoot)
+import Gargantext.Config (toUrl, End(..), NodeType(..), defaultRoot)
+import Gargantext.Config.REST (get, put, post, delete, deleteWithBody)
+import Gargantext.Components.Loader as Loader
 
 type Name = String
 type Open = Boolean
 type URL  = String
 type ID   = Int
 
+type Props = { root :: ID }
+
 data NTree a = NTree a (Array (NTree a))
 
 type FTree = NTree LNode
 
-data Action =  ShowPopOver
+data Action =  ShowPopOver ID
               | ToggleFolder ID
-              | RenameNode  String
-              | Submit
-            -- | Initialize
+              | RenameNode  String ID
+              | Submit ID String
+              | DeleteNode ID
+              | Create  ID
+              | SetNodeValue String ID
+              | ToggleCreateNode ID
+              | ShowRenameBox ID
+              | CancelRename ID
 
-type State = FTree
+
+type State = { state :: FTree }
 
 initialState :: State
-initialState = NTree (LNode { id : 3
-                            , name : ""
-                            , nodeType : NodeUser
-                            , open : true
-                            , popOver : false
-                            , renameNodeValue : ""
-                          }) []
+initialState = { state: NTree (LNode {id : 3, name : "hello", nodeType : Node, open : true, popOver : false, renameNodeValue : "", createNode : false, nodeValue : "InitialNode", showRenameBox : false}) [] }
+
+mapFTree :: (FTree -> FTree) -> State -> State
+mapFTree f {state} = {state: f state}
+
+
+performAction :: forall props. PerformAction State props Action
+
+performAction (ToggleFolder i) _ _ =
+  modifyState_ $ mapFTree $ toggleNode i
+
+performAction (ShowPopOver id) _ _ =
+  modifyState_ $ mapFTree $ popOverNode id
+
+performAction (ShowRenameBox id) _ _ =
+  modifyState_ $ mapFTree $ showPopOverNode id
+
+performAction (CancelRename id) _ _ =
+  modifyState_ $ mapFTree $ showPopOverNode id
+
+performAction (ToggleCreateNode id) _ _ =
+  modifyState_ $ mapFTree $ showCreateNode id
+
+performAction (DeleteNode nid) _ _ = do
+  d <- lift $ deleteNode nid
+  --- TODO : Need to update state once API is called
+  pure unit
+
+--- TODO : Need to update state once API is called
+performAction (Submit rid s'') _  _  = do
+  d <- lift $ renameNode rid $ RenameValue { name : s''}
+  -- modifyState_ $ mapFTree $ popOverNode rid
+  modifyState_ $ mapFTree $ showPopOverNode rid -- add this function to toggle rename function
+
+performAction (RenameNode  r nid) _ _ =
+  modifyState_ $ mapFTree $ rename nid r
+
+performAction (Create  nid) _ _ =
+  modifyState_ $ mapFTree $ showCreateNode nid
+
+performAction (SetNodeValue v nid) _ _ =
+  modifyState_ $ mapFTree $ setNodeValue nid v
+
+
+popOverNode :: Int -> NTree LNode -> NTree LNode
+popOverNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary) =
+  NTree (LNode {id,name, nodeType, open , popOver : npopOver, renameNodeValue, createNode, nodeValue, showRenameBox}) $ map (popOverNode sid) ary
+  where
+    npopOver = if sid == id then not popOver else popOver
+
+
+showPopOverNode :: Int -> NTree LNode -> NTree LNode
+showPopOverNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary) =
+  NTree (LNode {id,name, nodeType, open , popOver , renameNodeValue, createNode, nodeValue, showRenameBox: nshowRenameBox}) $ map (showPopOverNode sid) ary
+  where
+    nshowRenameBox = if sid == id then not showRenameBox else showRenameBox
+
+
+showCreateNode :: Int -> NTree LNode -> NTree LNode
+showCreateNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary) =
+  NTree (LNode {id,name, nodeType, open , popOver, renameNodeValue, createNode : createNode', nodeValue, showRenameBox}) $ map (showCreateNode sid) ary
+  where
+    createNode' = if sid == id then not createNode else createNode
+
+----TODO get id and value to send API to call
+
+-- getCreateNode :: Int -> NTree LNode -> String
+-- getCreateNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue}) ary) =
+--   createNode
+--   where
+--     NTree (LNode {id,name, nodeType, open , popOver, renameNodeValue, createNode , nodeValue}) $ map (getCreateNode sid) ary
+--     createNode' = if sid == id then  nodeValue else ""
+
+
+rename :: Int ->  String -> NTree LNode  -> NTree LNode
+rename sid v (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary)  =
+  NTree (LNode {id,name, nodeType, open , popOver , renameNodeValue : rvalue, createNode, nodeValue, showRenameBox}) $ map (rename sid  v) ary
+  where
+    rvalue = if sid == id then  v   else ""
+
+
+setNodeValue :: Int ->  String -> NTree LNode  -> NTree LNode
+setNodeValue sid v (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary)  =
+  NTree (LNode {id,name, nodeType, open , popOver , renameNodeValue , createNode, nodeValue : nvalue, showRenameBox}) $ map (setNodeValue sid  v) ary
+  where
+    nvalue = if sid == id then  v   else ""
 
 
 toggleNode :: Int -> NTree LNode -> NTree LNode
-toggleNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue}) ary) =
-  NTree (LNode {id,name, nodeType, open : nopen, popOver, renameNodeValue}) $ map (toggleNode sid) ary
+toggleNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary) =
+  NTree (LNode {id,name, nodeType, open : nopen, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) $ map (toggleNode sid) ary
   where
     nopen = if sid == id then not open else open
 
+
+
 ------------------------------------------------------------------------
 -- Realistic Tree for the UI
 
 exampleTree :: NTree LNode
-exampleTree = NTree (LNode { id : 1
-                           , name : ""
-                           , nodeType : NodeUser
-                           , open : false
-                           , popOver : false
-                           , renameNodeValue : ""
-                           }
-                     ) []
+exampleTree = NTree (LNode {id : 1, name : "", nodeType : Node, open : false, popOver : false, renameNodeValue : "", createNode : false, nodeValue : "", showRenameBox : false}) []
 
 -- exampleTree :: NTree LNode
 -- exampleTree =
@@ -77,7 +172,7 @@ exampleTree = NTree (LNode { id : 1
 
 -- corpus :: Int -> String -> NTree (Tuple String String)
 -- corpus n name = NTree (LNode {id : n, name, nodeType : "", open : false})
---     [ NTree (Tuple "Tabs"    "#/corpus") []
+--     [ NTree (Tuple "Facets"    "#/corpus") []
 --     , NTree (Tuple "Dashboard" "#/dashboard") []
 --     , NTree (Tuple "Graph"     "#/graphExplorer") []
 --     ]
@@ -103,138 +198,197 @@ nodeOptionsView activated = case activated of
                          false -> []
 
 
-nodeOptionsRename :: (Action -> Effect Unit) ->  Boolean -> Array ReactElement
-nodeOptionsRename d activated =  case activated of
+nodeOptionsRename :: (Action -> Effect Unit) ->  Boolean ->  ID -> Array ReactElement
+nodeOptionsRename d activated  id =  case activated of
                          true -> [ a [className "glyphicon glyphicon-pencil", style {marginLeft : "15px"}
-                                        , onClick $ (\_-> d $ ShowPopOver)
+                                        
                                         ] []
                                  ]
                          false -> []
 
+type LoadedTreeViewProps = Loader.InnerProps Int FTree ()
 
-
-treeview :: Spec State {} Action
-treeview = simpleSpec performAction render
+loadedTreeview :: Spec State LoadedTreeViewProps Action
+loadedTreeview = simpleSpec performAction render
   where
-    performAction :: PerformAction State {} Action
-    performAction (ToggleFolder i) _ _ =
-      void $ modifyState (\td -> toggleNode i td)
-    performAction ShowPopOver _ _ = void $
-      modifyState $ \(NTree (LNode lnode) ary) -> NTree (LNode $ lnode { popOver = true }) ary
-    performAction Submit _  s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue}) ary)  = void $ do
-      d <- lift $ renameNode  id  $ RenameValue { name : getRenameNodeValue s}
-      modifyState identity -- TODO why ???
-    performAction (RenameNode  r) _ _ = void $
-      modifyState $ \(NTree (LNode lnode) ary) -> NTree (LNode $ lnode { renameNodeValue  = r }) ary
-    -- performAction Initialize _ _ = void $ do
-    --  s <- lift $ loadDefaultNode
-    --  case s of
-    --    Left err -> modifyState identity
-    --    Right d -> modifyState (\state -> d)
-
-    render :: Render State {} Action
-    render dispatch _ state _ =
+    render :: Render State LoadedTreeViewProps Action
+    render dispatch _ {state} _ =
       [ div [className "tree"]
         [ toHtml dispatch state
 
         ]
       ]
 
+treeViewClass :: ReactClass (Loader.InnerProps Int FTree (children :: React.Children))
+treeViewClass = createClass "TreeView" loadedTreeview (\{loaded: t} -> {state: t})
+
+treeLoaderClass :: Loader.LoaderClass Int FTree
+treeLoaderClass = Loader.createLoaderClass "TreeLoader" loadNode
+
+treeLoader :: Loader.Props' Int FTree -> ReactElement
+treeLoader props = React.createElement treeLoaderClass props []
+
+treeview :: Spec {} Props Void
+treeview = simpleSpec defaultPerformAction render
+  where
+    render :: Render {} Props Void
+    render _ {root} _ _ =
+      [ treeLoader { path: root
+                   , component: treeViewClass
+                   } ]
+
+renameTreeView :: (Action -> Effect Unit) -> FTree -> Int -> ReactElement
+renameTreeView d s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, showRenameBox }) ary) nid  =
+        
+       div [className "col-md-12", _id "rename-tooltip",className "btn btn-secondary", _data {toggle  : "tooltip", placement : "right"}, title "Settings on right"]
+       [  div [_id "arrow"] []
+       , div [className "panel panel-default", style {border:"1px solid rgba(0,0,0,0.2)", boxShadow : "0 2px 5px rgba(0,0,0,0.2)"}]
+           [
+             div [className "panel-heading", style {float:"left", width: "100%"}]
+             [
+               if (showRenameBox) then div [_id "afterClick"] 
+               [ 
+                 div [className "col-md-12"] 
+               [
+                 input [ _type "text"
+                    , placeholder "Rename Node"
+                    , defaultValue $ getRenameNodeValue s
+                    , style {float: "left"}
+                    , className "col-md-2 form-control"
+                    , onInput \e -> d (RenameNode (unsafeEventValue e) nid)
+                    ]
+               ]
+              , div [className "col-md-12"] 
+              [ div [className "row", style {marginTop : "11px"}]
+                [ div [className "col-md-6"] [
+                     a [className "btn btn-danger"
+                    , _type "button"
+                    , onClick \_ -> d $ (Submit nid renameNodeValue)
+                    , style {float:"left"}
+                    ] [text "Rename"]
+                    ]
+                , div [className "col-md-6"] 
+                  [a [className "btn btn-primary"
+                     , _type "button"
+                     , onClick \_ -> d $ (CancelRename nid)
+                     , style {float:"left", backgroundColor: "white", color:"black"}
+                     ] [text "cancel"]
+
+                  ]
+                ]
+              
+                ]
+               
+            ]
+              else 
+                div [ _id "beforeClick", className "col-md-12"] 
+             [  div [className "row"]
+                [ div [className "col-md-6"] [text name] 
+                , a [ style {color:"black"},className "glyphitem glyphicon glyphicon-pencil col-md-2", _id "rename1", title "Rename", onClick $ (\_-> d $ (ShowRenameBox id))] [ ]
+                ]
+             ]
+             ]
+           ,div [className "panel-body", style {display:"flex", justifyContent : "center", backgroundColor: "white", border: "none"}]
+            [   div [className "col-md-4"] [a [ style {color:"black", paddingTop: "6px", paddingBottom: "6px"},className "glyphitem glyphicon glyphicon-download-alt", _id "rename1", title "Download [WIP]"] [ ]]
+           , div [className "col-md-4"] [a [ style {color:"black", paddingTop: "6px", paddingBottom: "6px"},className "glyphitem glyphicon glyphicon-duplicate", _id "rename1", title "Duplicate [WIP]"] [ ]]
+           ,  div [className "col-md-4"] [ a [style {color:"black", paddingTop: "6px", paddingBottom: "6px"}, className "glyphitem glyphicon glyphicon-trash", _id "rename2",title "Delete", onClick $ (\_-> d $ (DeleteNode id))] [ ]]
+
+           ]
+          
+          ]
+        ]
+       
 
 
-renameTreeView :: (Action -> Effect Unit) -> State -> ReactElement
-renameTreeView d s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue }) ary) =
+createNodeView :: (Action -> Effect Unit) -> FTree -> Int -> ReactElement
+createNodeView d s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue }) ary) nid  =
        div [className ""]
         [  div [className "panel panel-default"]
            [
              div [className "panel-heading"]
              [
-               h5 [] [text "Rename Node"]
+               h5 [] [text "Create Node"]
              ]
            ,div [className "panel-body"]
             [
               input [ _type "text"
-                    , placeholder "Rename Node"
-                    , value $ getRenameNodeValue s
+                    , placeholder "Create Node"
+                    , defaultValue $ getCreateNodeValue s
                     , className "col-md-12 form-control"
-                    , onInput \e -> d (RenameNode (unsafeEventValue e))
+                    , onInput \e -> d (SetNodeValue (unsafeEventValue e) nid)
                     ]
             ]
           , div [className "panel-footer"]
-            [ button [className "btn btn-danger"
+            [ button [className "btn btn-success"
                      , _type "button"
-                     , onClick \_ -> d $ Submit
-                     ] [text "Rename"]
+                     , onClick \_ -> d $ (Create nid )
+                     ] [text "Create"]
             ]
           ]
         ]
 
 
 
-renameTreeViewDummy :: (Action -> Effect Unit) -> State -> ReactElement
+renameTreeViewDummy :: (Action -> Effect Unit) -> FTree -> ReactElement
 renameTreeViewDummy d s = div [] []
 
-popOverValue :: State -> Boolean
-popOverValue (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue }) ary) = popOver
+popOverValue :: FTree -> Boolean
+popOverValue (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, showRenameBox }) ary) = popOver
+
+getRenameNodeValue :: FTree -> String
+getRenameNodeValue (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, showRenameBox }) ary) = renameNodeValue
 
-getRenameNodeValue :: State -> String
-getRenameNodeValue (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue }) ary) = renameNodeValue
+
+getCreateNodeValue :: FTree -> String
+getCreateNodeValue (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, nodeValue, showRenameBox}) ary) = nodeValue
 
 
 toHtml :: (Action -> Effect Unit) -> FTree -> ReactElement
-toHtml d (NTree (LNode {id, name, nodeType : Folder, open, popOver, renameNodeValue}) []) =
-  ul [ ]
-  [ li [] $
-    ( [ a [onClick $ (\e-> d $ ToggleFolder id)] [i [fldr open] []]
-      ,  a [ href (toUrl Front Folder id )]
-           [ text $ " " <> name <> " " ]
-      ] <> nodeOptionsCorp false
-    )
-  ]
-toHtml d s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue}) []) =
+toHtml d s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode,nodeValue, showRenameBox }) []) =
   ul []
   [
-    li [ style {width:"100%"}]
+    li [] $
     [
-      a [ href (toUrl Front nodeType id)]
+     a [onClick $ (\e-> d $ ToggleFolder id)] [i [fldr open] []]
+      , a [ href (toUrl Front nodeType (Just id)), style {position:"absolute",left:"44px"}]
       ( [ text (name <> "    ")
         ]
-        <> nodeOptionsView false
-        <> (nodeOptionsRename  d false)
-        -- <>[ if ((popOverValue s) == true) then (renameTreeView d s ) else (renameTreeView d s)]
       )
+    
+    ,  a [className "glyphicon glyphicon-cog", _id "rename",onClick $ (\_-> d $ (ShowPopOver id))]
+       [ 
+       ]
+     , if (popOver == true) then (renameTreeView d s id) else (renameTreeViewDummy d s)
+    , if (createNode == true) then (createNodeView d s id) else (renameTreeViewDummy d s)
     ]
   ]
 --- need to add renameTreeview value to this function
-toHtml d s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue}) ary) =
-  ul [ ]
-  [ li [style {width : "100%"}] $
+toHtml d s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue,createNode, nodeValue, showRenameBox}) ary) =
+    ul []
+  [ li [] $
     ( [ a [onClick $ (\e-> d $ ToggleFolder id)] [i [fldr open] []]
-      ,  a [ href (toUrl Front nodeType id )]
-           [ text $ " " <> name <> " " ]
-      ] <> nodeOptionsCorp false <>
+      ,  a [ href (toUrl Front nodeType (Just id)), style {position:"absolute",left:"44px"}]
+         [ text $ " " <> name <> " " ]
+,      a [className "glyphicon glyphicon-cog", _id "rename",onClick $ (\_-> d $ (ShowPopOver id))]
+       [ 
+       ]
+     , if (popOver == true) then (renameTreeView d s id) else (renameTreeViewDummy d s)
+    , if (createNode == true) then (createNodeView d s id) else (renameTreeViewDummy d s)
+
+      ] <>
       if open then
         map (toHtml d) ary
         else []
-     <> nodeOptionsView false
-     <> (nodeOptionsRename  d false)
-     -- <>[ if ((popOverValue s) == true) then (renameTreeView d s ) else (renameTreeView d s)]
     )
   ]
 
 
 
-fldr :: Boolean -> Props
+fldr :: Boolean -> DOM.Props
 fldr open = if open then className "fas fa-folder-open" else className "fas fa-folder"
 
 
-newtype LNode = LNode { id       :: Int
-                      , name     :: String
-                      , nodeType :: NodeType
-                      , open     :: Boolean
-                      , popOver  :: Boolean
-                      , renameNodeValue :: String
-                    }
+newtype LNode = LNode {id :: Int, name :: String, nodeType :: NodeType, open :: Boolean, popOver :: Boolean, renameNodeValue :: String, nodeValue :: String, createNode :: Boolean, showRenameBox :: Boolean}
 
 derive instance newtypeLNode :: Newtype LNode _
 
@@ -244,13 +398,7 @@ instance decodeJsonLNode :: DecodeJson LNode where
     id_ <- obj .? "id"
     name <- obj .? "name"
     nodeType <- obj .? "type"
-    pure $ LNode { id : id_
-                 , name
-                 , nodeType
-                 , open : true
-                 , popOver : false
-                 , renameNodeValue : ""
-               }
+    pure $ LNode {id : id_, name, nodeType, open : true, popOver : false, renameNodeValue : "", createNode : false, nodeValue : "", showRenameBox : false}
 
 instance decodeJsonFTree :: DecodeJson (NTree LNode) where
   decodeJson json = do
@@ -261,8 +409,8 @@ instance decodeJsonFTree :: DecodeJson (NTree LNode) where
     nodes' <- decodeJson nodes
     pure $ NTree node' nodes'
 
-loadDefaultNode :: Aff (NTree LNode)
-loadDefaultNode = get $ toUrl Back Tree defaultRoot
+loadNode :: Int -> Aff FTree
+loadNode = get <<< toUrl Back Tree <<< Just
 
 ----- TREE CRUD Operations
 
@@ -273,26 +421,22 @@ newtype RenameValue = RenameValue
 
 instance encodeJsonRenameValue :: EncodeJson RenameValue where
   encodeJson (RenameValue post)
-     = "name" := post.name
+     = "r_name" := post.name
     ~> jsonEmptyObject
 
-
-renameNode :: Int -> RenameValue -> Aff Int     --- need to change return type herre
-renameNode renameNodeId reqbody =
-  put ("http://localhost:8008/api/v1.0/node/" <> show renameNodeId <> "/rename")
-      reqbody
+renameNode :: Int -> RenameValue -> Aff (Array Int)
+renameNode renameNodeId = put $ toUrl Back Node (Just renameNodeId) <> "/rename"
 
 deleteNode :: Int -> Aff Int
-deleteNode = delete <<< toUrl Back Tree
+deleteNode = delete <<< toUrl Back Node <<< Just
 
--- See https://stackoverflow.com/questions/21863326/delete-multiple-records-using-rest
--- As of now I would recommend simply issuing many requests.
--- In a second time implement a set of end points for batch edition.
-deleteNodes :: Array Int -> Aff (Array Int)
-deleteNodes = traverse deleteNode
+-- UNUSED
+-- deleteNodes :: TODO -> Aff Int
+-- deleteNodes = deleteWithBody (toUrl Back Nodes Nothing)
 
-createNode :: String -> Aff Int
-createNode reqbody = post (toUrl Back Tree 1) reqbody
+-- UNUSED
+-- createNode :: TODO -> Aff Int
+-- createNode = post (toUrl Back Node Nothing)
 
 fnTransform :: LNode -> FTree
 fnTransform n = NTree n []

src/Gargantext/Config.purs

@@ -11,70 +11,77 @@ module Gargantext.Config where
 
 import Prelude
 import Data.Argonaut (class DecodeJson, decodeJson)
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Show (genericShow)
 import Data.Map (Map)
 import Data.Map as DM
-import Data.Maybe (maybe)
+import Data.Maybe (Maybe(..), maybe)
 import Data.Tuple (Tuple(..))
 
+import Gargantext.Types
+
 endConfig :: EndConfig
 endConfig = endConfig' V10
 
 endConfig' :: ApiVersion -> EndConfig
-endConfig' v = { front : frontCaddy
-               , back  : backDev v }
+endConfig' v = { front : frontRelative
+               , back  : backLocal v }
 
 -- | Default Root on shared database to develop
 -- until authentication implementation
 -- (Default Root will be given after authentication)
 defaultRoot :: Int
-defaultRoot = 347474
+defaultRoot = 950094
 ------------------------------------------------------------------------
+frontRelative :: Config
+frontRelative = { baseUrl: ""
+                , prePath: "/#/"
+                }
+
 frontCaddy :: Config
-frontCaddy = { proto   : "http://"
-             , port       : 2015
-             , domain     : "localhost"
-             , prePath    : "/#/"
+frontCaddy = { baseUrl: "http://localhost:2015"
+             , prePath: "/#/"
              }
 
 frontHaskell :: Config
-frontHaskell = { proto   : "http://"
-               , port       : 8008
-               , domain     : "localhost"
-               , prePath    : "/index.html#/"
+frontHaskell = { baseUrl: "http://localhost:8008"
+               , prePath: "/#/"
                }
 
+frontDev :: Config
+frontDev = { baseUrl: "https://dev.gargantext.org"
+           , prePath: "/#/"
+           }
+
 frontProd :: Config
-frontProd = { proto   : "https://"
-            , port       : 8080
-            , domain     : "gargantext.org"
-            , prePath    : "/index.html#/"
+frontProd = { baseUrl: "https://gargantext.org"
+            , prePath: "/#/"
             }
 
 ------------------------------------------------------------------------
 
+backLocal :: ApiVersion -> Config
+backLocal v = { baseUrl: "http://localhost:8008"
+              , prePath: "/api/" <> show v <> "/"
+              }
+
 backDev :: ApiVersion -> Config
-backDev v = { proto      : "http://"
-            , port       : 8008
-            , domain     : "localhost"
-            , prePath    : "/api/" <> show v <> "/"
+backDev v = { baseUrl: "https://dev.gargantext.org"
+            , prePath: "/api/" <> show v <> "/"
             }
 
 backProd :: ApiVersion -> Config
-backProd v = { proto      : "https://"
-            , port       : 8080
-            , domain     : "gargantext.org"
-            , prePath    : "/api/" <> show v <> "/"
-            }
+backProd v = { baseUrl: "https://gargantext.org"
+             , prePath: "/api/" <> show v <> "/"
+             }
 ------------------------------------------------------------------------
 
 type EndConfig = { front :: Config
                  , back  :: Config
                  }
 
-type Config = { proto      :: String
-              , port       :: Int
-              , domain     :: String
-              , prePath    :: String
+type Config = { baseUrl :: String
+              , prePath :: String
               }
 
 ------------------------------------------------------------
@@ -85,23 +92,23 @@ type Url      = String
 
 doUrl :: UrlBase -> UrlPath -> UrlParam -> Url
 doUrl b p ps = b <> p <> ps
-------------------------------------------------------------
+
+endOf :: forall cfg. End -> { front :: cfg, back :: cfg } -> cfg
+endOf Back  = _.back
+endOf Front = _.front
+
 endBaseUrl :: End -> EndConfig -> UrlBase
-endBaseUrl Back  c = baseUrl c.back
-endBaseUrl Front c = baseUrl c.front
+endBaseUrl end c = (endOf end c).baseUrl
 
-baseUrl :: Config -> UrlBase
-baseUrl conf = conf.proto <> conf.domain <> ":" <> show conf.port
-------------------------------------------------------------
-endPathUrl :: End -> EndConfig -> NodeType -> Id -> UrlPath
-endPathUrl Back  c nt i = pathUrl c.back  nt i
-endPathUrl Front c nt i = pathUrl c.front nt i
+endPathUrl :: End -> EndConfig -> NodeType -> Maybe Id -> UrlPath
+endPathUrl end c nt i = pathUrl (endOf end c) nt i
 
-pathUrl :: Config -> NodeType -> Id -> UrlPath
-pathUrl c nt@(Tab _ _ _) i = pathUrl c Node i <> "/" <> show nt
-pathUrl c nt i = c.prePath <> urlConfig nt <> "/" <> show i
+pathUrl :: Config -> NodeType -> Maybe Id -> UrlPath
+pathUrl c nt@(Tab _ _ _ _) i = pathUrl c Node i <> "/" <> show nt
+pathUrl c nt@(Ngrams _ _) i = pathUrl c Node i <> "/" <> show nt
+pathUrl c nt i = c.prePath <> urlConfig nt <> (maybe "" (\i' -> "/" <> show i') i)
 ------------------------------------------------------------
-toUrl :: End -> NodeType -> Id -> Url
+toUrl :: End -> NodeType -> Maybe Id -> Url
 toUrl e nt i = doUrl base path params
   where
     base   = endBaseUrl e endConfig
@@ -110,7 +117,8 @@ toUrl e nt i = doUrl base path params
 ------------------------------------------------------------
 data NodeType = NodeUser
               | Annuaire
-              | Tab TabType Offset Limit
+              | Tab TabType Offset Limit (Maybe OrderBy)
+              | Ngrams TabType (Maybe TermList)
               | Corpus
               | CorpusV3
               | Dashboard
@@ -120,12 +128,21 @@ data NodeType = NodeUser
               | Graph
               | Individu
               | Node
+              | Nodes
               | Tree
 data End = Back | Front
 type Id  = Int
 
 type Limit  = Int
 type Offset = Int
+data OrderBy = DateAsc  | DateDesc
+             | TitleAsc | TitleDesc
+             | FavDesc  | FavAsc
+
+derive instance genericOrderBy :: Generic OrderBy _
+
+instance showOrderBy :: Show OrderBy where
+  show = genericShow
 
 ------------------------------------------------------------
 data ApiVersion = V10 | V11
@@ -134,19 +151,21 @@ instance showApiVersion :: Show ApiVersion where
   show V11 = "v1.1"
 ------------------------------------------------------------
 
-data TabType = TabDocs | TabTerms | TabSources | TabAuthors | TabTrash
+data TabType = TabDocs | TabTerms | TabSources | TabAuthors | TabInstitutes | TabTrash
 
 instance showTabType :: Show TabType where
-  show TabDocs    = "Docs"
-  show TabTerms   = "Terms"
-  show TabSources = "Sources"
-  show TabAuthors = "Authors"
-  show TabTrash   = "Trash"
+  show TabDocs       = "Docs"
+  show TabTerms      = "Terms"
+  show TabSources    = "Sources"
+  show TabAuthors    = "Authors"
+  show TabInstitutes = "Institutes"
+  show TabTrash      = "Trash"
 
 ------------------------------------------------------------
 urlConfig :: NodeType -> Url
 urlConfig Annuaire  = show Annuaire
-urlConfig nt@(Tab _ _ _) = show nt
+urlConfig nt@(Tab _ _ _ _) = show nt
+urlConfig nt@(Ngrams _ _) = show nt
 urlConfig Corpus    = show Corpus
 urlConfig CorpusV3  = show CorpusV3
 urlConfig Dashboard = show Dashboard
@@ -156,6 +175,7 @@ urlConfig Folder    = show Folder
 urlConfig Graph     = show Graph
 urlConfig Individu  = show Individu
 urlConfig Node      = show Node
+urlConfig Nodes      = show Nodes
 urlConfig NodeUser  = show NodeUser
 urlConfig Tree      = show Tree
 ------------------------------------------------------------
@@ -170,21 +190,35 @@ instance showNodeType :: Show NodeType where
   show Graph     = "graph"
   show Individu  = "individu"
   show Node      = "node"
+  show Nodes      = "nodes"
   show NodeUser  = "user"
   show Tree      = "tree"
-  show (Tab t o l) = "table?view=" <> show t <> "&offset=" <> show o <> "&limit=" <> show l <> "&order=DateAsc"
+  show (Tab t o l s) = "table?view=" <> show t <> "&offset=" <> show o
+                         <> "&limit=" <> show l <> os
+    where
+      os = maybe "" (\x -> "&order=" <> show x) s
+  show (Ngrams t listid) = "listGet?ngramsType=" <> show t <> listid'
+    where
+      listid' = maybe "" (\x -> "&list=" <> show x) listid
 
 -- | TODO : where is the Read Class ?
+-- NP: We don't need the Read class. Here are the encoding formats we need:
+-- * JSON
+-- * URL parts has in {To,From}HttpApiData but only for certain types
+-- The Show class should only be used for dev.
+
 -- instance readNodeType :: Read NodeType where
 readNodeType :: String -> NodeType
 readNodeType "NodeAnnuaire"   = Annuaire
-readNodeType "Tab"   = (Tab TabDocs 0 0)
+readNodeType "Tab"   = (Tab TabDocs 0 0 Nothing)
+readNodeType "Ngrams"   = (Ngrams TabTerms Nothing)
 readNodeType "NodeDashboard"  = Dashboard
 readNodeType "Document"   = Url_Document
 readNodeType "NodeFolder"     = Folder
 readNodeType "NodeGraph"      = Graph
 readNodeType "Individu"   = Individu
 readNodeType "Node"       = Node
+readNodeType "Nodes"       = Nodes
 readNodeType "NodeCorpus" = Corpus
 readNodeType "NodeCorpusV3" = CorpusV3
 readNodeType "NodeUser"   = NodeUser

src/Gargantext/Config/REST.purs

@@ -51,5 +51,10 @@ put url = send PUT url <<< Just
 delete :: forall a. DecodeJson a => String -> Aff a
 delete url = send DELETE url noReqBody
 
+-- This might not be a good idea:
+-- https://stackoverflow.com/questions/14323716/restful-alternatives-to-delete-request-body
+deleteWithBody :: forall a b. EncodeJson a => DecodeJson b => String -> a -> Aff b
+deleteWithBody url = send DELETE url <<< Just
+
 post :: forall a b. EncodeJson a => DecodeJson b => String -> a -> Aff b
 post url = send POST url <<< Just

src/Gargantext/Pages/Annuaire.purs

 module Gargantext.Pages.Annuaire where
 
-import Control.Monad.Trans.Class (lift)
-import Data.Lens (Lens', lens, (?~))
+import Data.Argonaut (class DecodeJson, decodeJson, (.?), (.??))
+import Data.Lens (Prism', prism)
+import Data.Either (Either(..))
 import Data.Maybe (Maybe(..), maybe)
 import Data.Map (lookup)
-import React (ReactElement)
+import Effect (Effect)
+import Effect.Aff (Aff)
+import React (ReactClass, ReactElement, Children)
+import React as React
 import React.DOM (a, b, b', br', div, h3, hr, i, input, p, table, tbody, td, text, th, thead, tr)
+import React.DOM (a, br', div, input, p, text)
 import React.DOM.Props (className, href, scope, style)
-import Effect.Aff (Aff)
-import Thermite (Render, Spec
-                , simpleSpec
-                , PerformAction, modifyState)
+import Effect.Class (liftEffect)
+import Thermite ( Render, Spec
+                , createClass, simpleSpec, defaultPerformAction
+                )
 
 ------------------------------------------------------------------------------
 import Gargantext.Prelude
+import Gargantext.Components.Loader as Loader
+import Gargantext.Components.Tab as Tab
+import Gargantext.Components.Table as T
 import Gargantext.Config      (toUrl, NodeType(..), TabType(..), End(..))
 import Gargantext.Config.REST (get)
-import Gargantext.Pages.Annuaire.User.Contacts.Types (Contact(..), HyperData(..))
-import Gargantext.Utils.DecodeMaybe ((.?|))
-import Data.Argonaut (class DecodeJson, decodeJson, (.?))
+import Gargantext.Pages.Annuaire.User.Contacts.Types (Contact(..), HyperData(..), HyperdataContact(..))
 ------------------------------------------------------------------------------
-type State = { info  :: Maybe AnnuaireInfo
-             , stable :: Maybe AnnuaireTable
-             }
-
-type Offset = Int
-type Limit  = Int
-type PageSize = Int
-
-data Action = Load Int
-            | ChangePageSize PageSize -- TODO
-            | ChangePage     Int      -- TODO
 
+type Props = Loader.InnerProps Int AnnuaireInfo ()
 
-type AnnuaireTable' = Table IndividuView
+data Action
+  = TabsA   Tab.Action
 
-newtype Table a
-  = Table
-    { rows         :: Array { row :: a }
-    , totalPages   :: Int
-    , currentPage  :: Int
-    , pageSize     :: PageSize
-    , totalRecords :: Int
-    , title        :: String
-    }
+_tabsAction :: Prism' Action Tab.Action
+_tabsAction = prism TabsA \ action ->
+  case action of
+    TabsA taction -> Right taction
+    -- _-> Left action
 
 newtype IndividuView
   = CorpusView
@@ -54,12 +47,16 @@ newtype IndividuView
     }
 
 ------------------------------------------------------------------------------
-initialState :: State
-initialState = { info : Nothing, stable : Nothing }
 
+-- unused
 defaultAnnuaireTable :: AnnuaireTable
-defaultAnnuaireTable = AnnuaireTable { annuaireTable : [Nothing] }
+defaultAnnuaireTable = AnnuaireTable { annuaireTable : [] }
+
+-- unused
+defaultHyperdataAnnuaire :: HyperdataAnnuaire
+defaultHyperdataAnnuaire = HyperdataAnnuaire { title: Nothing, desc: Nothing }
 
+-- unused
 defaultAnnuaireInfo :: AnnuaireInfo
 defaultAnnuaireInfo = AnnuaireInfo { id : 0
                                    , typename : 0
@@ -67,90 +64,129 @@ defaultAnnuaireInfo = AnnuaireInfo { id : 0
                                    , parentId : 0
                                    , name     : ""
                                    , date     : ""
-                                   , hyperdata : ""
+                                   , hyperdata : defaultHyperdataAnnuaire
                                    }
 ------------------------------------------------------------------------------
-toRows :: AnnuaireTable -> Array (Maybe (Contact Void Void))
+toRows :: AnnuaireTable -> Array (Maybe Contact)
 toRows (AnnuaireTable a) = a.annuaireTable
 
+{-
 layoutAnnuaire :: Spec State {} Action
 layoutAnnuaire = simpleSpec performAction render
   where
-    performAction :: PerformAction State {} Action
-    performAction (Load aId) _ _ = do
-      info' <- lift $ getInfo aId
-      void $ modifyState $ _info ?~ info'
-      table' <- lift $ getTable aId
-      logs "Feching Table"
-      void $ modifyState $ _table ?~ table'
-      logs "Annuaire page fetched."
-    performAction (ChangePageSize _) _ _ = pure unit -- TODO
-    performAction (ChangePage _)     _ _ = pure unit -- TODO
-
-    render :: Render State {} Action
-    render dispatch _ state _ = [ div [className "row"]
-                     [ div [className "col-md-3"] [ h3 [] [text info.name] ]
-                            , div [className "col-md-9"] [ hr [style {height : "2px",backgroundColor : "black"}] ]
-                            ]
-                          , div [className "row"] [ div [className "jumbotron1", style {padding : "12px 0px 20px 12px"}]
-                                [ div [ className "col-md-8 content"]
-                                      [ p [] [ i [className "fa fa-globe"] []
-                                      , text info.name
-                                             ]
-                                      ]
-                                , div [ className "col-md-4 content"]
-                                      [ p [] [ i [className "fa fa-calendar"] []
-                                      , text ("Last update: " <> info.date)
-                                             ]
-                                      ]
-                                ]
-                            ]
-                            ,             p [] []
-            , div [] [ text "    Filter ", input []]
-            , br'
-            , div [className "row"]
-              [  div [className "col-md-1"] [b [] [text "title"]]
-              --, div [className "col-md-2"] [sizeDD d.pageSize dispatch]
-              --, div [className "col-md-3"] [textDescription d.currentPage d.pageSize d.totalRecords]
-              --, div [className "col-md-3"] [pagination dispatch d.totalPages d.currentPage]
-                     ]
-            , table [ className "table"]
-              [thead  [ className "thead-dark"]
-                         [tr [] [ th [scope "col"] [ b' [text ""]    ]
-                                , th [scope "col"] [ b' [text "Name"]   ]
-                                , th [scope "col"] [ b' [text "Role"]  ]
-                                , th [scope "col"] [ b' [text "Service"]  ]
-                                , th [scope "col"] [ b' [text "Company"]  ]
-                                ]
-                         ]
-                         , tbody [] $ map showRow individuals
-              ]
-                   ]
+    render :: Render {} {annuaireId :: Int} Void
+    render _ {annuaireId} _ _ =
+      [ annuaireLoader
+          { path: annuaireId
+          , component: createClass "LoadedAnnuaire" loadedAnnuaireSpec (const {})
+          } ]
+          -}
+
+layout :: Spec {} {annuaireId :: Int} Void
+layout = simpleSpec defaultPerformAction render
+  where
+    render :: Render {} {annuaireId :: Int} Void
+    render _ {annuaireId} _ _ =
+      [ annuaireLoader
+          { path: annuaireId
+          , component: createClass "LoadedAnnuaire" loadedAnnuaireSpec (const {})
+          } ]
+
+loadedAnnuaireSpec :: Spec {} Props Void
+loadedAnnuaireSpec = simpleSpec defaultPerformAction render
+  where
+    render :: Render {} Props Void
+    render _ {path: nodeId, loaded: annuaireInfo@AnnuaireInfo {name, date}} _ _ =
+      T.renderTableHeaderLayout
+        { title: name
+        , desc: name
+        , query: ""
+        , date: "Last update: " <> date
+        , user: ""
+        } <>
+      [ p [] []
+      , div [] [ text "    Filter ", input []]
+      , br'
+      , pageLoader
+          { path: initialPageParams nodeId
+          , annuaireInfo
+          }
+      ]
+
+type PageParams = {nodeId :: Int, params :: T.Params}
+
+initialPageParams :: Int -> PageParams
+initialPageParams nodeId = {nodeId, params: T.initialParams}
+
+type PageLoaderProps =
+  { path :: PageParams
+  , annuaireInfo :: AnnuaireInfo
+  }
+
+renderPage :: forall props path.
+              Render (Loader.State {nodeId :: Int | path} AnnuaireTable)
+                     {annuaireInfo :: AnnuaireInfo | props}
+                     (Loader.Action PageParams)
+renderPage _ _ {loaded: Nothing} _ = [] -- TODO loading spinner
+renderPage dispatch {annuaireInfo} { currentPath: {nodeId}
+                                   , loaded: Just (AnnuaireTable {annuaireTable: res})
+                                   } _ = [ T.tableElt { rows
+                                       , setParams: \params -> liftEffect $ dispatch (Loader.SetPath {nodeId, params})
+                                       , container: T.defaultContainer { title: "Annuaire" } -- TODO
+                                       , colNames: T.ColumnName <$> [ "", "Name", "Company", "Service", "Role"]
+                                       , totalRecords: 4361 -- TODO
+                                       }
+                                     ]
                         where
-                          (AnnuaireInfo  info)   = maybe defaultAnnuaireInfo  identity state.info
-                          (AnnuaireTable stable) = maybe defaultAnnuaireTable identity state.stable
-                          individuals = maybe (toRows defaultAnnuaireTable) toRows state.stable
+                          --rows = (\c -> {row: [text $ show c.id], delete: false}) <$> res
+                          rows = (\c -> {row: renderContactCells c, delete: false}) <$> res
 
-
-showRow :: Maybe (Contact Void Void) -> ReactElement
+{-
+showRow :: Maybe Contact -> ReactElement
 showRow Nothing = tr [][]
-showRow (Just (Contact {id: id, hyperdata: (HyperData {specific: contact}) })) =
-  tr []
-  [ td [] [ a [ href (toUrl Front NodeUser id) ] [
-               text $
-               (maybe' $ lookInContact "prenom")
-               <> " "
-               <> (maybe'$ lookInContact "nom")
+showRow (Just (Contact {id: id, hyperdata: (HyperdataContact contact) })) = tr [] []
+  [ td [] [ a [ href (toUrl Front NodeUser (Just id)) ] [
+               text $ maybe "name" identity contact.title
                ]
           ]
-  , td [] [text $ maybe' $ lookInContact "fonction"]
-  , td [] [text $ maybe' $ lookInContact "service"]
-  , td [] [text $ maybe' $ lookInContact "groupe"]
+  , td [] [text $ maybe "fonction" identity contact.source]
+  , td [] [text $ maybe "groupe"   identity contact.source]
+  , td [] [text $ "date entry"]
+  ]
+    --where
+      --maybe' key = maybe (key <> " not found") identity $ lookup key contact
+      -}
+
+pageLoaderClass :: ReactClass { path :: PageParams, annuaireInfo :: AnnuaireInfo, children :: Children }
+pageLoaderClass = Loader.createLoaderClass' "AnnuairePageLoader" loadPage renderPage
+
+pageLoader :: PageLoaderProps -> ReactElement
+pageLoader props = React.createElement pageLoaderClass props []
+
+--{-
+renderContactCells :: Maybe Contact -> Array ReactElement
+renderContactCells Nothing = []
+renderContactCells (Just (Contact { id, hyperdata : (HyperdataContact contact) })) =
+  [ text ""
+  , a [ href (toUrl Front NodeUser (Just id)) ] [ text $ maybe "name" identity contact.title ]
+  , text $ maybe "ecole" identity contact.source
+  , text "" -- $ maybe' contact.groupe
+  , text "" -- $ maybe' contact.groupe
   ]
-    where
-      maybe' = maybe "" identity
-      lookInContact key = lookup key contact
+  where
+    maybe' = maybe "" identity
+    ---}
+
+data HyperdataAnnuaire = HyperdataAnnuaire
+  { title :: Maybe String
+  , desc  :: Maybe String }
 
+instance decodeHyperdataAnnuaire :: DecodeJson HyperdataAnnuaire where
+  decodeJson json = do
+    obj   <- decodeJson json
+    title <- obj .?? "title"
+    desc  <- obj .?? "desc"
+    pure $ HyperdataAnnuaire { title, desc }
 
 ------------------------------------------------------------------------------
 newtype AnnuaireInfo = AnnuaireInfo { id        :: Int
@@ -159,7 +195,7 @@ newtype AnnuaireInfo = AnnuaireInfo { id        :: Int
                                     , parentId  :: Int
                                     , name      :: String
                                     , date      :: String
-                                    , hyperdata :: String
+                                    , hyperdata :: HyperdataAnnuaire
                                     }
 
 instance decodeAnnuaireInfo :: DecodeJson AnnuaireInfo where
@@ -182,21 +218,24 @@ instance decodeAnnuaireInfo :: DecodeJson AnnuaireInfo where
                         }
 
 
-newtype AnnuaireTable  = AnnuaireTable  { annuaireTable :: Array (Maybe (Contact Void Void))}
+newtype AnnuaireTable  = AnnuaireTable  { annuaireTable :: Array (Maybe Contact)}
+
 instance decodeAnnuaireTable :: DecodeJson AnnuaireTable where
   decodeJson json = do
     rows <- decodeJson json
     pure $ AnnuaireTable { annuaireTable : rows}
 ------------------------------------------------------------------------
-getTable :: Int -> Aff AnnuaireTable
-getTable id = get $ toUrl Back (Tab TabDocs 0 10) id
+loadPage :: PageParams -> Aff AnnuaireTable
+loadPage {nodeId, params} = get $ toUrl Back (Tab TabDocs 0 10 Nothing) (Just nodeId)
+ -- TODO Tab TabDocs is not the right API call
+ -- TODO params, see loadPage in Documents
 
-getInfo :: Int -> Aff AnnuaireInfo
-getInfo id = get $ toUrl Back Node id
+getAnnuaireInfo :: Int -> Aff AnnuaireInfo
+getAnnuaireInfo id = get $ toUrl Back Node (Just id)
 ------------------------------------------------------------------------------
-_table :: Lens' State (Maybe AnnuaireTable)
-_table = lens (\s -> s.stable) (\s ss -> s{stable = ss})
 
-_info :: Lens' State (Maybe AnnuaireInfo)
-_info = lens (\s -> s.info) (\s ss -> s{info = ss})
-------------------------------------------------------------------------------
+annuaireLoaderClass :: ReactClass (Loader.Props Int AnnuaireInfo)
+annuaireLoaderClass = Loader.createLoaderClass "AnnuaireLoader" getAnnuaireInfo
+
+annuaireLoader :: Loader.Props' Int AnnuaireInfo -> ReactElement
+annuaireLoader props = React.createElement annuaireLoaderClass props []

src/Gargantext/Pages/Annuaire/User/Contacts/API.purs

@@ -15,11 +15,11 @@ import Gargantext.Prelude
 import Gargantext.Pages.Annuaire.User.Contacts.Types (Action(..), State, Contact, _contact)
 import Thermite (PerformAction, modifyState)
 
-getContact :: Int -> Aff (Contact Void Void)
+getContact :: Maybe Int -> Aff Contact
 getContact id = get $ toUrl Back Node id
 
 fetchContact :: Int -> StateCoTransformer State Unit
 fetchContact contactId = do
-  contact <- lift $ getContact contactId
+  contact <- lift $ getContact (Just contactId)
   void $ modifyState $ _contact ?~ contact
   logs "Fetching contact..."

src/Gargantext/Pages/Annuaire/User/Contacts/Specs/Renders.purs

@@ -5,11 +5,11 @@ import Gargantext.Pages.Annuaire.User.Contacts.Types
 
 import Data.List (List, zipWith, catMaybes, toUnfoldable)
 import Data.Map (Map, empty, keys, values, lookup)
-import Data.Maybe (Maybe(..))
+import Data.Maybe (Maybe(..), maybe)
 import Data.Set (toUnfoldable) as S
 import Data.Tuple (Tuple(..), uncurry)
 import Data.Unfoldable (class Unfoldable)
-import Prelude (Void)
+import Prelude (identity)
 import Prelude (($), (<<<), (<$>), flip, class Ord)
 import React (ReactElement)
 import React.DOM (div, h3, img, li, span, text, ul)
@@ -22,7 +22,7 @@ render dispatch _ state _ =
   [
           div [className "col-md-12"]
           $ case state.contact of
-            (Just (Contact contact)) -> display contact.name [contactInfos contact.hyperdata]
+            (Just (Contact contact)) -> display (maybe "no name" identity contact.name) [contactInfos contact.hyperdata]
             Nothing -> display "Contact not found" []
   ]
 
@@ -55,7 +55,7 @@ mapMyMap f m = toUnfoldable
 
 infixl 4 mapMyMap as <.~$>
 
-contactInfos :: HyperData Void Void -> ReactElement
+contactInfos :: HyperdataContact -> ReactElement
 contactInfos hyperdata =
     ul [className "list-group"] [] {- $
     listInfo <.~$> hyperdata

src/Gargantext/Pages/Annuaire/User/Contacts/Types.purs

@@ -2,10 +2,10 @@ module Gargantext.Pages.Annuaire.User.Contacts.Types where
 
 import Prelude
 
-import Data.Argonaut (class DecodeJson, decodeJson, (.?))
+import Data.Argonaut (class DecodeJson, decodeJson, (.?), (.??))
 import Data.Either (Either(..))
 import Data.Lens (Lens', Prism', lens, prism)
-import Data.Maybe (Maybe(..))
+import Data.Maybe (Maybe(..), maybe)
 import Data.Map (Map(..))
 
 import React (ReactElement)
@@ -14,16 +14,36 @@ import React.DOM (div)
 import Gargantext.Components.Tab as Tab
 import Gargantext.Utils.DecodeMaybe ((.?|))
 
-data Contact c s = Contact {
+data Contact = Contact {
   id :: Int
   , typename :: Maybe Int
-  , userId :: Int
+  , userId :: Maybe Int
   , parentId :: Maybe Int
-  , name :: String
+  , name :: Maybe String
   , date :: Maybe String
-  , hyperdata :: HyperData c s
+  , hyperdata :: HyperdataContact
   }
 
+data HyperdataContact =
+     HyperdataContact { bdd :: Maybe String
+                      , uniqId :: Maybe String
+                      , uniqIdBdd :: Maybe String
+                      , title :: Maybe String
+                      , source :: Maybe String
+                    }
+
+instance decodeHyperdataContact :: DecodeJson HyperdataContact
+  where
+    decodeJson json = do
+      obj <- decodeJson json
+      bdd <- obj .?? "bdd"
+      uniqId <- obj .?? "uniqId"
+      uniqIdBdd <- obj .?? "uniqIdBdd"
+      title     <- obj .?? "title"
+      source    <- obj .?? "source"
+      pure $ HyperdataContact {bdd, uniqId, uniqIdBdd, title, source}
+
+
 data HyperData c s =
   HyperData
   { common :: c
@@ -39,17 +59,17 @@ instance decodeUserHyperData :: (DecodeJson c, DecodeJson s) =>
     specific <- decodeJson json
     pure $ HyperData {common, shared, specific}
 
-instance decodeUser :: (DecodeJson c, DecodeJson s) =>
-                       DecodeJson (Contact c s) where
+instance decodeUser :: DecodeJson Contact where
   decodeJson json = do
     obj <- decodeJson json
     id <- obj .? "id"
     typename <- obj .?| "typename"
-    userId <- obj .? "userId"
+    userId <- obj .?? "userId"
     parentId <- obj .?| "parentId"
-    name <- obj .? "name"
+    name <- obj .?? "name"
     date <- obj .?| "date"
     hyperdata <- obj .? "hyperdata"
+    
     pure $ Contact { id, typename, userId
                    , parentId, name, date
                    , hyperdata
@@ -61,7 +81,7 @@ data Action
 
 type State =
   { activeTab :: Int
-  , contact :: Maybe (Contact Void Void)
+  , contact :: Maybe Contact
   }
 
 initialState :: State
@@ -70,7 +90,7 @@ initialState =
   , contact: Nothing
   }
 
-_contact :: Lens' State (Maybe (Contact Void Void))
+_contact :: Lens' State (Maybe Contact)
 _contact = lens (\s -> s.contact) (\s ss -> s{contact = ss})
 
 _tablens :: Lens' State Tab.State

src/Gargantext/Pages/Corpus.purs

@@ -3,12 +3,10 @@ module Gargantext.Pages.Corpus where
 
 import Data.Either (Either(..))
 import Data.Lens (Lens', Prism', lens, prism)
-import Data.Maybe (maybe)
+import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff)
 import React as React
 import React (ReactClass, ReactElement)
-import React.DOM (div, h3, hr, i, p, text)
-import React.DOM.Props (className, style)
 import Thermite ( Render, Spec, createClass, defaultPerformAction, focus
                 , simpleSpec, noState )
 --------------------------------------------------------
@@ -16,9 +14,10 @@ import Gargantext.Prelude
 import Gargantext.Components.Node (NodePoly(..))
 import Gargantext.Components.Loader as Loader
 import Gargantext.Components.Loader (createLoaderClass)
+import Gargantext.Components.Table as Table
 import Gargantext.Config      (toUrl, NodeType(..), End(..))
 import Gargantext.Config.REST (get)
-import Gargantext.Pages.Corpus.Tabs.Types (CorpusInfo(..), corpusInfoDefault)
+import Gargantext.Pages.Corpus.Tabs.Types (CorpusInfo(..))
 import Gargantext.Pages.Corpus.Tabs.Types (Props) as Tabs
 import Gargantext.Pages.Corpus.Tabs.States (State, initialState) as Tabs
 import Gargantext.Pages.Corpus.Tabs.Actions (Action) as Tabs
@@ -29,9 +28,9 @@ type Props = Tabs.Props
 type State = { tabsView    :: Tabs.State
              }
 
-initialState :: State
-initialState = { tabsView    : Tabs.initialState
-               }
+initialState :: Props -> State
+initialState _props =
+  { tabsView    : Tabs.initialState {} }
 
 ------------------------------------------------------------------------
 _tabsView :: forall a b. Lens' { tabsView :: a | b } a
@@ -66,44 +65,27 @@ corpusHeaderSpec = simpleSpec defaultPerformAction render
   where
     render :: Render {} Props Void
     render dispatch {loaded} _ _ =
-        [ div [className "row"]
-          [ div [className "col-md-3"] [ h3 [] [text "Corpus " <> text title] ]
-          , div [className "col-md-9"] [ hr [style {height : "2px",backgroundColor : "black"}] ]
-          ]
-        , div [className "row"] [ div [className "jumbotron1", style {padding : "12px 0px 20px 12px"}]
-              [ div [ className "col-md-8 content"]
-                    [ p [] [ i [className "fa fa-globe"] []
-                           , text $ " " <> corpus.desc
-                           ]
-                    , p [] [ i [className "fab fa-searchengin"] []
-                           , text $ " " <> corpus.query
-                           ]
-                    ]
-              , div [ className "col-md-4 content"]
-                    [ p [] [ i [className "fa fa-calendar"] []
-                           , text $ " " <> date'
-                           ]
-                    , p [] [ i [className "fa fa-user"] []
-                           , text $ " " <> corpus.authors
-                           ]
-                    ]
-              ]
-          ]
-        ]
-          where
-            NodePoly { name: title
-                     , date: date'
-                     , hyperdata : CorpusInfo corpus
-                   }
-              = maybe corpusInfoDefault identity loaded
+      Table.renderTableHeaderLayout
+        { title: "Corpus " <> title
+        , desc:  corpus.desc
+        , query: corpus.query
+        , date:  date'
+        , user:  corpus.authors
+        }
+      where
+        NodePoly { name: title
+                 , date: date'
+                 , hyperdata : CorpusInfo corpus
+                 }
+          = loaded
 
 ------------------------------------------------------------------------
 
 getCorpus :: Int -> Aff (NodePoly CorpusInfo)
-getCorpus = get <<< toUrl Back Corpus
+getCorpus = get <<< toUrl Back Corpus <<< Just
 
 corpusLoaderClass :: ReactClass (Loader.Props Int (NodePoly CorpusInfo))
 corpusLoaderClass = createLoaderClass "CorpusLoader" getCorpus
 
-corpusLoader :: Loader.Props Int (NodePoly CorpusInfo) -> ReactElement
-corpusLoader = React.createLeafElement corpusLoaderClass
+corpusLoader :: Loader.Props' Int (NodePoly CorpusInfo) -> ReactElement
+corpusLoader props = React.createElement corpusLoaderClass props []

src/Gargantext/Pages/Corpus/Document.purs

 module Gargantext.Pages.Corpus.Document where
 
 
-import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject, (.?), (:=), (~>))
+import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject, (.?), (.??), (:=), (~>))
 import Data.Generic.Rep (class Generic)
-import Data.Lens (Lens', Prism', lens, prism, (?~))
+import Data.Lens (Lens', lens, (?~))
 import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Either (Either(..))
@@ -22,12 +22,12 @@ import Gargantext.Components.Node (NodePoly(..))
 
 
 type State =
-  { document   :: Maybe (NodePoly DocumentV3)
+  { document   :: Maybe (NodePoly Document)
   , inputValue :: String
   }
 
-initialState :: State
-initialState =
+initialState :: {} -> State
+initialState {} =
   { document   : Nothing
   , inputValue : ""
   }
@@ -99,22 +99,22 @@ data Document =
   Document { abstract           :: Maybe String
            , authors            :: Maybe String
            , bdd                :: Maybe String
-           , doi                :: Maybe Int
+           , doi                :: Maybe String
            , language_iso2      :: Maybe String
-           , language_iso3      :: Maybe String
-           , page               :: Maybe Int
+           -- , page               :: Maybe Int
            , publication_date   :: Maybe String
-           , publication_second :: Maybe Int
-           , publication_minute :: Maybe Int
-           , publication_hour   :: Maybe Int
-           , publication_day    :: Maybe String
+           --, publication_second :: Maybe Int
+           --, publication_minute :: Maybe Int
+           --, publication_hour   :: Maybe Int
+           , publication_day    :: Maybe Int
            , publication_month  :: Maybe Int
            , publication_year   :: Maybe Int
            , source             :: Maybe String
+           , institutes         :: Maybe String
            , title              :: Maybe String
            , uniqId             :: Maybe String
-           , url                :: Maybe String
-           , text               :: Maybe String
+           --, url                :: Maybe String
+           --, text               :: Maybe String
            }
 
 defaultNodeDocument :: NodePoly Document
@@ -128,6 +128,7 @@ defaultNodeDocument =
            , hyperdata : defaultDocument
          }
 
+-- TODO: BUG if DOI does not exist, page is not shown
 defaultDocument :: Document
 defaultDocument =
   Document { abstract           : Nothing
@@ -135,20 +136,20 @@ defaultDocument =
            , bdd                : Nothing
            , doi                : Nothing
            , language_iso2      : Nothing
-           , language_iso3      : Nothing
-           , page               : Nothing
+           --, page               : Nothing
            , publication_date   : Nothing
-           , publication_second : Nothing
-           , publication_minute : Nothing
-           , publication_hour   : Nothing
+           --, publication_second : Nothing
+           --, publication_minute : Nothing
+           --, publication_hour   : Nothing
            , publication_day    : Nothing
            , publication_month  : Nothing
            , publication_year   : Nothing
            , source             : Nothing
+           , institutes         : Nothing
            , title              : Nothing
            , uniqId             : Nothing
-           , url                : Nothing
-           , text               : Nothing
+           --, url                : Nothing
+           --, text               : Nothing
            }
 
 derive instance genericDocument   :: Generic Document   _
@@ -178,7 +179,7 @@ instance decodeDocumentV3 :: DecodeJson DocumentV3
   where
     decodeJson json = do
       obj <- decodeJson json
-      abstract <- obj .? "abstract"
+      abstract <- obj .?? "abstract"
       authors  <- obj .? "authors"
       --error    <- obj .? "error"
       language_iso2 <- obj .? "language_iso2"
@@ -218,59 +219,60 @@ instance decodeDocument :: DecodeJson Document
   where
     decodeJson json = do
       obj <- decodeJson json
-      abstract <- obj .? "abstract"
-      authors  <- obj .? "authors"
-      bdd      <- obj .? "bdd"
-      doi      <- obj .? "doi"
-      language_iso2 <- obj .? "language_iso2"
-      language_iso3 <- obj .? "language_iso3"
-      page          <- obj .? "page"
-      publication_date   <- obj .? "publication_date"
-      publication_second <- obj .? "publication_second"
-      publication_minute <- obj .? "publication_minute"
-      publication_hour   <- obj .? "publication_hour"
-      publication_day    <- obj .? "publication_day"
-      publication_month  <- obj .? "publication_month"
-      publication_year   <- obj .? "publication_year"
-      source             <- obj .? "source"
-      title              <- obj .? "title"
-      uniqId             <- obj .? "uniqId"
-      url                <- obj .? "url"
-      text               <- obj .? "text"
+      abstract <- obj .?? "abstract"
+      authors  <- obj .?? "authors"
+      bdd      <- obj .?? "bdd"
+      doi      <- obj .?? "doi"
+      language_iso2 <- obj .?? "language_iso2"
+      -- page          <- obj .?? "page"
+      publication_date   <- obj .?? "publication_date"
+      --publication_second <- obj .?? "publication_second"
+      --publication_minute <- obj .?? "publication_minute"
+      --publication_hour   <- obj .?? "publication_hour"
+      publication_day    <- obj .?? "publication_day"
+      publication_month  <- obj .?? "publication_month"
+      publication_year   <- obj .?? "publication_year"
+      source             <- obj .?? "sources"
+      institutes         <- obj .?? "institutes"
+      title              <- obj .?? "title"
+      uniqId             <- obj .?? "uniqId"
+      --url                <- obj .? "url"
+      --text               <- obj .? "text"
       pure $ Document { abstract
                       , authors
                       , bdd
                       , doi
                       , language_iso2
-                      , language_iso3
-                      , page
+                      -- , page
                       , publication_date
-                      , publication_second
-                      , publication_minute
-                      , publication_hour
+                      --, publication_second
+                      --, publication_minute
+                      --, publication_hour
                       , publication_day
                       , publication_month
                       , publication_year
                       , source
+                      , institutes
                       , title
                       , uniqId
-                      , url
-                      , text
+                      --, url
+                      --, text
                       }
 
 ------------------------------------------------------------------------
 performAction :: PerformAction State {} Action
 performAction (Load nId) _ _ = do
-  node <- lift $ getNode nId
+  node <- lift $ getNode (Just nId)
   void $ modifyState $ _document ?~ node
   logs $ "Node Document " <> show nId <> " fetched."
 performAction (ChangeString ps) _ _ = pure unit
 performAction (SetInput ps) _ _ = void <$> modifyState $ _ { inputValue = ps }
 
-getNode :: Int -> Aff (NodePoly DocumentV3)
+
+getNode :: Maybe Int -> Aff (NodePoly Document)
 getNode = get <<< toUrl Back Node
 
-_document :: Lens' State (Maybe (NodePoly DocumentV3))
+_document :: Lens' State (Maybe (NodePoly Document))
 _document = lens (\s -> s.document) (\s ss -> s{document = ss})
 ------------------------------------------------------------------------
 
@@ -394,8 +396,8 @@ docview = simpleSpec performAction render
           text' x = text $ maybe "Nothing" identity x
           badge s = span [className "badge badge-default badge-pill"] [text s]
 
-          NodePoly {hyperdata : DocumentV3 document} = 
-            maybe defaultNodeDocumentV3 identity state.document
+          NodePoly {hyperdata : Document document} = 
+            maybe defaultNodeDocument identity state.document
 
 aryPS :: Array String
 aryPS = ["Map", "Main", "Stop"]

src/Gargantext/Pages/Corpus/Graph.purs

 module Gargantext.Pages.Corpus.Graph where
 
+import Gargantext.Prelude
+
+import Affjax (defaultRequest, request)
+import Affjax.ResponseFormat (printResponseFormatError)
+import Affjax.ResponseFormat as ResponseFormat
 import Control.Monad.Cont.Trans (lift)
+import Data.Argonaut (decodeJson)
 import Data.Array (length, mapWithIndex, (!!))
 import Data.Either (Either(..))
+import Data.HTTP.Method (Method(..))
 import Data.Int (toNumber)
 import Data.Maybe (Maybe(..), fromJust)
 import Data.Newtype (class Newtype)
 import Effect.Aff (Aff)
+import Effect.Class (liftEffect)
+import Effect.Console (log)
+import Gargantext.Components.GraphExplorer.Sigmajs (Color(Color), SigmaEasing, SigmaGraphData(SigmaGraphData), SigmaNode, SigmaSettings, canvas, edgeShape, edgeShapes, forceAtlas2, sStyle, sigma, sigmaEasing, sigmaEdge, sigmaEnableWebGL, sigmaNode, sigmaSettings)
+import Gargantext.Components.GraphExplorer.Types (Cluster(..), Edge(..), GraphData(..), Legend(..), Node(..), getLegendData)
+import Gargantext.Config.REST (get)
+import Gargantext.Utils (getter)
 import Math (cos, sin)
 import Partial.Unsafe (unsafePartial)
 import React (ReactElement)
 import React.DOM (a, br', button, div, form', input, li, li', menu, option, p, select, span, text, ul, ul')
-import React.DOM.Props (_id, _type, checked, className, href, name, onChange, placeholder, style, title, value)
+import React.DOM.Props (_id, _type, checked, className, href, name, onChange, onClick,placeholder, style, title, value)
 import Thermite (PerformAction, Render, Spec, modifyState, simpleSpec)
 import Unsafe.Coerce (unsafeCoerce)
 
-import Gargantext.Prelude
-import Gargantext.Config.REST (get)
-import Gargantext.Components.GraphExplorer.Sigmajs (Color(Color), SigmaEasing, SigmaGraphData(SigmaGraphData), SigmaNode, SigmaSettings, canvas, edgeShape, edgeShapes, forceAtlas2, sStyle, sigma, sigmaEasing, sigmaEdge, sigmaEnableWebGL, sigmaNode, sigmaSettings)
-import Gargantext.Components.GraphExplorer.Types (Cluster(..), Edge(..), GraphData(..), Legend(..), Node(..), getLegendData)
-import Gargantext.Utils (getter)
 
 
 data Action
-  = LoadGraph String
+  = LoadGraph Int         
   | SelectNode SelectedNode
+  | ShowSidePanel 
 
 newtype SelectedNode = SelectedNode {id :: String, label :: String}
 
@@ -37,6 +46,7 @@ newtype State = State
   , sigmaGraphData :: Maybe SigmaGraphData
   , legendData :: Array Legend
   , selectedNode :: Maybe SelectedNode
+  , showSidePanel :: Boolean
   }
 
 initialState :: State
@@ -46,6 +56,7 @@ initialState = State
   , sigmaGraphData : Nothing
   , legendData : []
   , selectedNode : Nothing
+  , showSidePanel : false
   }
 
 graphSpec :: Spec State {} Action
@@ -54,19 +65,22 @@ graphSpec = simpleSpec performAction render
 performAction :: PerformAction State {} Action
 performAction (LoadGraph fp) _ _ = void do
   _ <- logs fp
-  case fp of
-    "" -> do
-      modifyState \(State s) -> State s {filePath = fp, graphData = GraphData {nodes : [], edges : []}, sigmaGraphData = Nothing}
-    _  -> do
-      _ <- modifyState \(State s) -> State s {filePath = fp, sigmaGraphData = Nothing}
-      gd <- lift $ getGraphData fp
+  _ <- modifyState \(State s) -> State s { sigmaGraphData = Nothing}
+  gd <- lift $ getNodes fp
       -- TODO: here one might `catchError getGraphData` to visually empty the
       -- graph.
-      modifyState \(State s) -> State s {filePath = fp, graphData = gd, sigmaGraphData = Just $ convert gd, legendData = getLegendData gd}
+  case gd of
+    Left err -> do
+      _ <- liftEffect $  log err 
+      modifyState identity
+    Right resp -> modifyState \(State s) -> State s {graphData = resp, sigmaGraphData = Just $ convert resp, legendData = getLegendData resp}
 
 performAction (SelectNode node) _ _ = void do
   modifyState $ \(State s) -> State s {selectedNode = pure node}
 
+performAction (ShowSidePanel) _ (State state) = void do
+  modifyState $ \(State s) -> State s {showSidePanel = not (state.showSidePanel) }
+
 convert :: GraphData -> SigmaGraphData
 convert (GraphData r) = SigmaGraphData { nodes, edges}
   where
@@ -87,18 +101,7 @@ convert (GraphData r) = SigmaGraphData { nodes, edges}
 
 render :: Render State {} Action
 render d p (State s) c =
-  [ select [ onChange $ \e -> d $ LoadGraph (unsafeCoerce e).target.value, value s.filePath]
-    [ option [value ""] [text ""]
-    , option [value "example_01_clean.json"] [text "example_01_clean.json"]
-    , option [value "example_01_conditional.json"] [text "example_01_conditional.json"]
-    , option [value "example_01_distributional.json"] [text "example_01_distributional.json"]
-    , option [value "example_02.json"] [text "example_02.json"]
-    , option [value "example_02_clean.json"] [text "example_02_clean.json"]
-    , option [value "example_03.json"] [text "example_03.json"]
-    , option [value "example_03_clean.json"] [text "example_03_clean.json"]
-    , option [value "imtNew.json"] [text "imtNew.json"]
-    -- , option [value "exemplePhyloBipartite.gexf"] [text "exemplePhyloBipartite.gexf"]
-    ]
+  [ 
   ]
   <>
   case s.sigmaGraphData of
@@ -271,7 +274,7 @@ specOld = simpleSpec performAction render'
     render' :: Render State {} Action
     render' d _ (State st) _ =
       [  div [className "row"] [
-            div [className "col-md-12", style {marginTop : "21px", marginBottom : "21px"}]
+            div [className "col-md-12", style {marginBottom : "21px"}]
             [ menu [_id "toolbar"]
               [ ul'
                 [
@@ -334,27 +337,15 @@ specOld = simpleSpec performAction render'
                 , li'
                   [ button [className "btn btn-primary"] [text "Save"] -- TODO: Implement Save!
                   ]
+                
                 ]
               ]
             ]
            ]
          , div [className "row"]
-           [ div [className "col-md-9"]
+           [ div [if (st.showSidePanel) then className "col-md-10" else className "col-md-11"]
              [ div [style {border : "1px black solid", height: "90%"}] $
-               [ select [ onChange $ \e -> d $ LoadGraph (unsafeCoerce e).target.value
-                        , value st.filePath
-                        ]
-                 [ option [value ""] [text ""]
-                 , option [value "example_01_clean.json"] [text "example_01_clean.json"]
-                 , option [value "example_01_conditional.json"] [text "example_01_conditional.json"]
-                 , option [value "example_01_distributional.json"] [text "example_01_distributional.json"]
-                 , option [value "example_02.json"] [text "example_02.json"]
-                 , option [value "example_02_clean.json"] [text "example_02_clean.json"]
-                 , option [value "example_03.json"] [text "example_03.json"]
-                 , option [value "example_03_clean.json"] [text "example_03_clean.json"]
-                 , option [value "imtNew.json"] [text "imtNew.json"]
-                   -- , option [value "exemplePhyloBipartite.gexf"] [text "exemplePhyloBipartite.gexf"]
-                 ]
+               [ 
                ]
                <>
                case st.sigmaGraphData of
@@ -377,9 +368,11 @@ specOld = simpleSpec performAction render'
                  <>
                  if length st.legendData > 0 then [div [style {position : "absolute", bottom : "10px", border: "1px solid black", boxShadow : "rgb(0, 0, 0) 0px 2px 6px", marginLeft : "10px", padding:  "16px"}] [dispLegend st.legendData]] else []
              ]
-         , div [className "col-md-3", style {border : "1px black solid", backgroundColor : "beige"}]
+         , button [onClick \_ -> d ShowSidePanel, className "btn btn-primary", style {right:"0px",position : "relative",zIndex:"1000"}] [text "show sidepanel"]
+         , if (st.showSidePanel) then 
+            div [_id "sp-container",className "col-md-2", style {border : "1px black solid", backgroundColor : "beige", position:"absolute",right: "0px",top:"265px"}]
              [ div [className "row"]
-               [ div [_id "sidepanel" , className "col-md-12", style {borderBottom : "1px solid black"}]
+               [ div [_id "sidepanel" , style {borderBottom : "1px solid black"}]
                [ case st.selectedNode of
                     Nothing -> span [] []
                     Just selectedNode -> p [] [text $ "selected Node : " <> getter _.label selectedNode
@@ -475,5 +468,31 @@ specOld = simpleSpec performAction render'
                 ]
                ]
              ]
+            else 
+              div [] []   -- ends sidepanel column here
            ]
          ]
+
+
+
+
+
+getNodes :: Int -> Aff (Either String GraphData)
+getNodes graphId = do
+   res <- request $ defaultRequest
+         { url = "http://localhost:8008/api/v1.0/graph/"<> show graphId
+         , responseFormat = ResponseFormat.json
+         , method = Left GET
+         , headers = []
+         
+         }
+   case res.body of
+     Left err -> do
+       _ <- liftEffect $ log $ printResponseFormatError err
+       pure $ Left $ printResponseFormatError err
+     Right json -> do
+      --_ <- liftEffect $ log $ show a.status
+      --_ <- liftEffect $ log $ show a.headers
+      --_ <- liftEffect $ log $ show a.body
+      let obj = decodeJson json
+      pure obj

src/Gargantext/Pages/Corpus/Tabs/Actions.purs

@@ -3,42 +3,27 @@ module Gargantext.Pages.Corpus.Tabs.Actions where
 
 import Data.Lens (Prism', prism)
 import Data.Either (Either(..))
+import Data.Void (Void)
 
 import Gargantext.Pages.Corpus.Tabs.Documents as DV
-import Gargantext.Pages.Corpus.Tabs.Sources as SV
-import Gargantext.Pages.Corpus.Tabs.Authors as AV
-import Gargantext.Pages.Corpus.Tabs.Terms as TV
+import Gargantext.Pages.Corpus.Tabs.Ngrams.NgramsTable as NG
 import Gargantext.Components.Tab as Tab
 
 data Action
-  = DocviewA DV.Action
-  | SourceviewA SV.Action
-  | AuthorviewA AV.Action
-  | TermsviewA TV.Action
-  | TabViewA   Tab.Action
+  = DocViewA DV.Action -- = Void
+  | NgramViewA Void -- NG.Action TODO needed ?
+  | TabViewA   Tab.Action -- = ChangeTab which is only used locally
 
 _docAction :: Prism' Action DV.Action
-_docAction = prism DocviewA \ action ->
+_docAction = prism DocViewA \ action ->
   case action of
-    DocviewA laction -> Right laction
+    DocViewA laction -> Right laction
     _-> Left action
 
-_authorAction :: Prism' Action AV.Action
-_authorAction = prism AuthorviewA \ action ->
+_NgramViewA :: Prism' Action Void -- NG.Action
+_NgramViewA = prism NgramViewA \ action ->
   case action of
-    AuthorviewA laction -> Right laction
-    _-> Left action
-
-_sourceAction :: Prism' Action SV.Action
-_sourceAction = prism SourceviewA \ action ->
-  case action of
-    SourceviewA laction -> Right laction
-    _-> Left action
-
-_termsAction :: Prism' Action TV.Action
-_termsAction = prism TermsviewA \ action ->
-  case action of
-    TermsviewA laction -> Right laction
+    NgramViewA laction -> Right laction
     _-> Left action
 
 _tabAction :: Prism' Action Tab.Action

src/Gargantext/Pages/Corpus/Tabs/Authors.purs

-module Gargantext.Pages.Corpus.Tabs.Authors where
-
-
-import Prelude hiding (div)
-import React.DOM (h3, text)
-import Thermite (PerformAction, Render, Spec, defaultPerformAction, simpleSpec)
-
-type State = {}
-
-initialState :: State
-initialState = {}
-
-type Action = Void
-
-authorSpec :: Spec State {} Action
-authorSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render State {} Action
-    render dispatch _ state _ =
-       [ h3 [] [text "AuthorView"]]

src/Gargantext/Pages/Corpus/Tabs/Documents.purs

@@ -3,24 +3,42 @@ module Gargantext.Pages.Corpus.Tabs.Documents where
 import Data.Array (take, drop)
 import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject, (.?), (:=), (~>))
 
+import Affjax (defaultRequest, request)
+import Affjax.RequestBody (RequestBody(..))
+import Affjax.ResponseFormat (printResponseFormatError)
+import Affjax.ResponseFormat as ResponseFormat
+import Control.Monad.Cont.Trans (lift)
+import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson, jsonEmptyObject, (.?), (:=), (~>))
+import Data.Array (drop, take, (:))
+import Data.Either (Either(..))
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
-import Data.Maybe (maybe)
+import Data.HTTP.Method (Method(..))
+import Data.Maybe (Maybe(..), maybe)
+import Data.Set (Set)
+import Data.Set as Set
 import Data.Tuple (Tuple(..))
+import Effect (Effect)
 import Effect.Aff (Aff)
-import React.DOM (a, br', div, input, p, text)
-import React.DOM.Props (_type, className, href)
-import Thermite (Render, Spec, defaultPerformAction, simpleSpec)
+import Effect.Class (liftEffect)
+import React as React
+import React (ReactClass, ReactElement, Children)
 ------------------------------------------------------------------------
 import Gargantext.Prelude
-import Gargantext.Config (NodeType(..), TabType(..), toUrl, End(..))
-import Gargantext.Config.REST (get, post)
+import Gargantext.Config (NodeType(..), TabType(..), toUrl, End(..), OrderBy(..))
+import Gargantext.Config.REST (get, put, post, deleteWithBody)
 import Gargantext.Utils.DecodeMaybe ((.|))
 import Gargantext.Components.Charts.Options.ECharts (chart)
+import Gargantext.Components.Loader as Loader
 import Gargantext.Components.Table as T
 import Gargantext.Components.Node (NodePoly(..))
-import Gargantext.Pages.Corpus.Tabs.Types
+import Gargantext.Components.Table as T
 import Gargantext.Pages.Corpus.Dashboard (globalPublis)
+import Gargantext.Pages.Corpus.Tabs.Types (CorpusInfo(..), Props)
+import Gargantext.Utils.DecodeMaybe ((.|))
+import React.DOM (a, br', button, div, i, input, p, text)
+import React.DOM.Props (_type, className, href, name, onClick, placeholder, style, value)
+import Thermite (PerformAction, Render, Spec, defaultPerformAction, modifyState_, simpleSpec)
 ------------------------------------------------------------------------
 -- TODO: Pagination Details are not available from the BackEnd
 -- TODO: Search is pending
@@ -29,9 +47,14 @@ import Gargantext.Pages.Corpus.Dashboard (globalPublis)
 -- TODO: Filter is Pending
 -- TODO: When a pagination link is clicked, reload data. 
 
-type State = {}
+type State =
+  { documentIdsToDelete :: Set Int
+  }
 
-type Action = Void
+data Action
+  = MarkFavorites (Array Int)
+  | ToggleDocumentToDelete Int
+  | Trash
 
 newtype DocumentsView
   = DocumentsView
@@ -42,6 +65,7 @@ newtype DocumentsView
     , source :: String
     , fav    :: Boolean
     , ngramCount :: Int
+    , delete :: Boolean
     }
 
 
@@ -103,7 +127,7 @@ instance decodeResponse :: DecodeJson Response where
 
 
 -- | Filter
-filterSpec :: Spec State {} Action
+filterSpec :: Spec State Props Action
 filterSpec = simpleSpec defaultPerformAction render
   where
     render d p s c = [div [] [ text "    Filter "
@@ -112,66 +136,66 @@ filterSpec = simpleSpec defaultPerformAction render
 
 -- | Main layout of the Documents Tab of a Corpus
 layoutDocview :: Spec State Props Action
-layoutDocview = simpleSpec absurd render
+layoutDocview = simpleSpec performAction render
   where
+    performAction :: PerformAction State Props Action
+    performAction (MarkFavorites nids) {path : nodeId} _ =
+      void $ lift $ putFavorites nodeId (FavoriteQuery {favorites: nids})
+    --TODO add array of delete rows here
+    performAction (ToggleDocumentToDelete nid) _ _ =
+      modifyState_ \state -> state {documentIdsToDelete = toggleSet nid state.documentIdsToDelete}
+    performAction Trash {path: nodeId} {documentIdsToDelete} =
+      void $ lift $ deleteDocuments nodeId (DeleteDocumentQuery {documents: Set.toUnfoldable documentIdsToDelete})
+      -- TODO: what to do now that the documents are deleted
+      -- * should we reload?
+      -- * should we locally update our data?
+      -- * should we reset documentIdsToDelete?
+      -- * if so, how to un-check the checkboxes since the inputs are uncontrolled?
+      --   + There is no need to uncheck them if they disapear because we
+      --     either reload or local update our data.
+      --   + Sync the checked value using
+      --       `checked: Set.member n state.documentIdsToDelete`
+
     render :: Render State Props Action
-    render dispatch {path, loaded} _ _ =
-      [ div [className "container1"]
+    render dispatch {path: nodeId, loaded: corpusInfo} _ _ =
+      [ p [] []
+      , div [ style {textAlign : "center"}] [input [placeholder "Filter here"]]
+      , br'
+      , div [className "container1"]
         [ div [className "row"]
           [ chart globalPublis
           , div [className "col-md-12"]
-            [ p [] []
-            , div [] [ text "    Filter ", input []]
-            , br'
-            , T.tableElt
-                { loadRows
-                , title: "Documents"
-                , colNames:
-                    [ ""
-                    , "Date"
-                    , "Title"
-                    , "Source"
-                    , "Delete"
-                    ]
-                , totalRecords: maybe 47361 -- TODO
-                                  identity
-                                  ((\(NodePoly n) -> n.hyperdata)
-                                   >>>
-                                   (\(CorpusInfo c) -> c.totalRecords)
-                                  <$> loaded)
+            [ pageLoader
+                { path: initialPageParams nodeId
+                , corpusInfo
+                , dispatch
                 }
             ]
+          , div [className "col-md-12"]
+             [ button [ style {backgroundColor: "peru", padding : "9px", color : "white", border : "white", float: "right"}
+                      , onClick $ (\_ -> dispatch Trash)
+                      ]
+               [  i [className "glyphitem glyphicon glyphicon-trash", style {marginRight : "9px"}] []
+               ,  text "Trash it !"
+               ]
+             ]
           ]
         ]
       ]
-      where
-        loadRows {offset, limit} = do
-          _ <- logs "loading documents page"
-          res <- loadPage {nodeId: path,offset,limit}
-          _ <- logs "OK: loading page documents."
-          pure $
-            (\(DocumentsView r) ->
-                { row:
-                    [ div [className $ fa r.fav <> "fa-star"] []
-                    -- TODO show date: Year-Month-Day only
-                    , text r.date
-                    , a [ href (toUrl Front Url_Document r._id) ] [ text r.title ]
-                    , text r.source
-                    , input [ _type "checkbox"]
-                    ]
-                , delete: false
-                }) <$> res
-    fa true  = "fas "
-    fa false = "far "
 
 mock :: Boolean
 mock = false
 
-loadPage :: {nodeId :: Int, limit :: Int, offset :: Int} -> Aff (Array DocumentsView)
-loadPage {nodeId, limit, offset} = do
+type PageParams = {nodeId :: Int, params :: T.Params}
+
+initialPageParams :: Int -> PageParams
+initialPageParams nodeId = {nodeId, params: T.initialParams}
+
+loadPage :: PageParams -> Aff (Array DocumentsView)
+loadPage {nodeId, params: {limit, offset, orderBy}} = do
   logs "loading documents page: loadPage with Offset and limit"
   --res <- get $ toUrl Back (Children Url_Document offset limit) nodeId
-  res <- get $ toUrl Back (Tab TabDocs offset limit ) nodeId
+  res <- get $ toUrl Back (Tab TabDocs offset limit (convOrderBy <$> orderBy)) (Just nodeId)
   let docs = res2corpus <$> res
   _ <- logs "Ok: loading page documents"
   _ <- logs $ map show docs
@@ -188,23 +212,95 @@ loadPage {nodeId, limit, offset} = do
       , source : (\(Hyperdata hr) -> hr.source) r.hyperdata
       , fav    : r.favorite
       , ngramCount : r.ngramCount
+      , delete : false
      }
+    convOrderBy (T.ASC  (T.ColumnName "Date")) = DateAsc
+    convOrderBy (T.DESC (T.ColumnName "Date")) = DateDesc
+    convOrderBy (T.ASC  (T.ColumnName "Title")) = TitleAsc
+    convOrderBy (T.DESC (T.ColumnName "Title")) = TitleDesc
+
+    convOrderBy _ = DateAsc -- TODO
+
+type PageLoaderProps row =
+  { path :: PageParams
+  , corpusInfo :: NodePoly CorpusInfo
+  , dispatch :: Action -> Effect Unit
+  | row
+  }
 
+renderPage :: forall props path.
+              Render (Loader.State {nodeId :: Int | path} (Array DocumentsView))
+                     { corpusInfo :: NodePoly CorpusInfo
+                     , dispatch :: Action -> Effect Unit
+                     | props
+                     }
+                     (Loader.Action PageParams)
+renderPage _ _ {loaded: Nothing} _ = [] -- TODO loading spinner
+renderPage loaderDispatch {corpusInfo, dispatch} {currentPath: {nodeId}, loaded: Just res} _ =
+  [ T.tableElt
+      { rows
+      , setParams: \params -> liftEffect $ loaderDispatch (Loader.SetPath {nodeId, params})
+      , container: T.defaultContainer { title: "Documents" }
+      , colNames:
+          T.ColumnName <$>
+          [ ""
+          , "Date"
+          , "Title"
+          , "Source"
+          , "Delete"
+          ]
+      , totalRecords: maybe 47361 -- TODO
+                        identity
+                        ((\(NodePoly n) -> n.hyperdata)
+                         >>>
+                         (\(CorpusInfo c) -> c.totalRecords)
+                        <$> Just corpusInfo) -- TODO
+      }
+  ]
+  where
+    fa true  = "fas "
+    fa false = "far "
+    rows = (\(DocumentsView r) ->
+                { row:
+                    [ div []
+                      [ a [className $ fa r.fav <> "fa-star" ,onClick $ (\_->
+                          dispatch $ MarkFavorites [r._id])] []
+                      ]
+                    -- TODO show date: Year-Month-Day only
+                    , if (r.delete) then
+                        div [ style {textDecoration : "line-through"}][text r.date]
+                      else
+                        div [ ][text r.date]
+                    , if (r.delete) then
+                        a [ href (toUrl Front Url_Document (Just r._id)), style {textDecoration : "line-through"} ] [ text r.title ]
+                      else
+                        a [ href (toUrl Front Url_Document (Just r._id)) ] [ text r.title ]
+                    , if (r.delete) then
+                        div [style {textDecoration : "line-through"}] [ text r.source]
+                      else
+                        div [] [ text r.source]
+                    , input [ _type "checkbox", onClick $ (\_ -> dispatch $ ToggleDocumentToDelete r._id)]
+                    ]
+                , delete: true
+                }) <$> res
+
+pageLoaderClass :: ReactClass (PageLoaderProps (children :: Children))
+pageLoaderClass = Loader.createLoaderClass' "PageLoader" loadPage renderPage
+
+pageLoader :: PageLoaderProps () -> ReactElement
+pageLoader props = React.createElement pageLoaderClass props []
 
 ---------------------------------------------------------
 sampleData' :: DocumentsView
-sampleData' = DocumentsView {_id : 1, url : "", date : "date3", title : "title", source : "source", fav : false, ngramCount : 1}
+sampleData' = DocumentsView {_id : 1, url : "", date : "date3", title : "title", source : "source", fav : false, ngramCount : 1, delete : false}
 
 sampleData :: Array DocumentsView
 --sampleData = replicate 10 sampleData'
-sampleData = map (\(Tuple t s) -> DocumentsView {_id : 1, url : "", date : "2017", title: t, source: s, fav : false, ngramCount : 10}) sampleDocuments
+sampleData = map (\(Tuple t s) -> DocumentsView {_id : 1, url : "", date : "2017", title: t, source: s, fav : false, ngramCount : 10, delete : false}) sampleDocuments
 
 sampleDocuments :: Array (Tuple String String)
 sampleDocuments = [Tuple "Macroscopic dynamics of the fusion process" "Journal de Physique Lettres",Tuple "Effects of static and cyclic fatigue at high temperature upon reaction bonded silicon nitride" "Journal de Physique Colloques",Tuple "Reliability of metal/glass-ceramic junctions made by solid state bonding" "Journal de Physique Colloques",Tuple "High temperature mechanical properties and intergranular structure of sialons" "Journal de Physique Colloques",Tuple "SOLUTIONS OF THE LANDAU-VLASOV EQUATION IN NUCLEAR PHYSICS" "Journal de Physique Colloques",Tuple "A STUDY ON THE FUSION REACTION 139La + 12C AT 50 MeV/u WITH THE VUU EQUATION" "Journal de Physique Colloques",Tuple "Atomic structure of \"vitreous\" interfacial films in sialon" "Journal de Physique Colloques",Tuple "MICROSTRUCTURAL AND ANALYTICAL CHARACTERIZATION OF Al2O3/Al-Mg COMPOSITE INTERFACES" "Journal de Physique Colloques",Tuple "Development of oxidation resistant high temperature NbTiAl alloys and intermetallics" "Journal de Physique IV Colloque",Tuple "Determination of brazed joint constitutive law by inverse method" "Journal de Physique IV Colloque",Tuple "Two dimensional estimates from ocean SAR images" "Nonlinear Processes in Geophysics",Tuple "Comparison Between New Carbon Nanostructures Produced by Plasma with Industrial Carbon Black Grades" "Journal de Physique III",Tuple "<i>Letter to the Editor:</i> SCIPION, a new flexible ionospheric sounder in Senegal" "Annales Geophysicae",Tuple "Is reducibility in nuclear multifragmentation related to thermal scaling?" "Physics Letters B",Tuple "Independence of fragment charge distributions of the size of heavy multifragmenting sources" "Physics Letters B",Tuple "Hard photons and neutral pions as probes of hot and dense nuclear matter" "Nuclear Physics A",Tuple "Surveying the nuclear caloric curve" "Physics Letters B",Tuple "A hot expanding source in 50 A MeV Xe+Sn central reactions" "Physics Letters B"]
 
-initialState :: State
-initialState = {}
-
 newtype SearchQuery = SearchQuery
   {
     query :: Array String
@@ -223,3 +319,40 @@ instance encodeJsonSQuery :: EncodeJson SearchQuery where
 searchResults :: SearchQuery -> Aff Int
 searchResults squery = post "http://localhost:8008/count" unit
   -- TODO
+
+
+
+newtype FavoriteQuery = FavoriteQuery 
+                        { favorites :: Array Int
+                        }
+
+instance encodeJsonFQuery :: EncodeJson FavoriteQuery where
+  encodeJson (FavoriteQuery post)
+     = "favorites" := post.favorites
+       ~> jsonEmptyObject
+
+newtype DeleteDocumentQuery = DeleteDocumentQuery
+  {
+    documents :: Array Int
+  }
+
+
+instance encodeJsonDDQuery :: EncodeJson DeleteDocumentQuery where
+  encodeJson (DeleteDocumentQuery post)
+     = "documents" := post.documents
+       ~> jsonEmptyObject
+
+putFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
+putFavorites nodeId = put (toUrl Back Node (Just nodeId) <> "/favorites")
+
+deleteFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
+deleteFavorites nodeId = deleteWithBody (toUrl Back Node (Just nodeId) <> "/favorites")
+
+deleteDocuments :: Int -> DeleteDocumentQuery -> Aff (Array Int)
+deleteDocuments nodeId = deleteWithBody (toUrl Back Node (Just nodeId) <> "/documents")
+
+-- TODO: not optimal but Data.Set lacks some function (Set.alter)
+toggleSet :: forall a. Ord a => a -> Set a -> Set a
+toggleSet a s
+  | Set.member a s = Set.delete a s
+  | otherwise      = Set.insert a s

src/Gargantext/Pages/Corpus/Tabs/Ngrams/NgramsTable.purs

+module Gargantext.Pages.Corpus.Tabs.Ngrams.NgramsTable where
+
+
+import Control.Monad.State (class MonadState, execState)
+import Data.Argonaut (class DecodeJson, decodeJson, (.?), (.??))
+import Data.Array (filter, toUnfoldable)
+import Data.Either (Either(..))
+import Data.Foldable
+import Data.FoldableWithIndex
+import Data.FunctorWithIndex
+import Data.Newtype (class Newtype, unwrap)
+import Data.Lens (Lens', Prism', Iso', lens, over, prism, (^.), (^..), (%~), (.=), use, (<>~))
+import Data.Lens.Common (_Just)
+import Data.Lens.At (class At, at)
+import Data.Lens.Index (class Index, ix)
+import Data.Lens.Fold (folded)
+import Data.Lens.Getter (to)
+import Data.Lens.Record (prop)
+import Data.Lens.Iso (re)
+import Data.Lens.Iso.Newtype (_Newtype)
+import Data.List (List)
+import Data.List as List
+import Data.Map (Map)
+import Data.Map as Map
+import Data.Maybe (Maybe(..), maybe)
+import Data.Traversable (class Traversable, traverse, traverse_, sequence)
+import Data.TraversableWithIndex (class TraversableWithIndex, traverseWithIndex)
+import Data.Set (Set)
+import Data.Set as Set
+import Data.Symbol (SProxy(..))
+import Data.Tuple (Tuple(..), uncurry)
+import Data.Void (Void)
+import Data.Unit (Unit)
+import Effect (Effect)
+import Effect.Aff (Aff)
+import React (ReactElement, ReactClass, Children)
+import React as React
+import React.DOM hiding (style, map)
+import React.DOM.Props (_id, _type, checked, className, href, name, onChange, onClick, onInput, placeholder, scope, selected, style, value)
+import React.DOM.Props as DOM
+import Thermite (PerformAction, Spec, StateCoTransformer, Render, _render, modifyState_, defaultPerformAction, focusState, hideState, simpleSpec, createClass)
+import Unsafe.Coerce (unsafeCoerce)
+
+import Gargantext.Types
+import Gargantext.Components.Table as T
+import Gargantext.Prelude
+import Gargantext.Config
+import Gargantext.Config.REST
+import Gargantext.Components.Tree (NTree(..))
+import Gargantext.Components.Loader as Loader
+import Gargantext.Pages.Corpus.Tabs.Types (CorpusInfo(..), PropsRow)
+
+type Props = { mode :: Mode | PropsRow }
+
+type PageParams = {nodeId :: Int, params :: T.Params, mode :: Mode}
+
+type Props' = Loader.InnerProps PageParams NgramsTable ()
+
+type NgramsTerm = String
+
+newtype NgramsElement = NgramsElement
+  { ngrams      :: NgramsTerm
+  , list        :: TermList
+  , occurrences :: Int
+  , parent      :: Maybe NgramsTerm
+  , children    :: Set NgramsTerm
+  }
+
+_parent = prop (SProxy :: SProxy "parent")
+_children :: forall row. Lens' { children :: Set NgramsTerm | row } (Set NgramsTerm)
+_children = prop (SProxy :: SProxy "children")
+
+derive instance newtypeNgramsElement :: Newtype NgramsElement _
+
+_NgramsElement :: Iso' NgramsElement _
+_NgramsElement = _Newtype
+
+instance decodeJsonNgramsElement :: DecodeJson NgramsElement where
+  decodeJson json = do
+    obj         <- decodeJson json
+    ngrams      <- obj .?  "ngrams"
+    list        <- obj .?  "list"
+    occurrences <- obj .?  "occurrences"
+    parent      <- obj .?? "parent"
+    children'   <- obj .?  "children"
+    let children = Set.fromFoldable (children' :: Array NgramsTerm)
+    pure $ NgramsElement {ngrams, list, occurrences, parent, children}
+
+-- type NgramsTable = Array (NTree NgramsElement)
+-- type NgramsTable = Array NgramsElement
+newtype NgramsTable = NgramsTable (Map NgramsTerm NgramsElement)
+
+derive instance newtypeNgramsTable :: Newtype NgramsTable _
+
+_NgramsTable :: Iso' NgramsTable (Map NgramsTerm NgramsElement)
+_NgramsTable = _Newtype
+
+instance indexNgramsTable :: Index NgramsTable String NgramsElement where
+  ix k = _NgramsTable <<< ix k
+
+instance atNgramsTable :: At NgramsTable String NgramsElement where
+  at k = _NgramsTable <<< at k
+
+instance decodeJsonNgramsTable :: DecodeJson NgramsTable where
+  decodeJson json = do
+    elements <- decodeJson json
+    pure $ NgramsTable
+         $ Map.fromFoldable
+         $ f <$> (elements :: Array NgramsElement)
+    where
+      f e@(NgramsElement e') = Tuple e'.ngrams e
+
+data Replace a
+  = Keep
+  | Replace { old :: a, new :: a }
+
+replace :: forall a. Eq a => a -> a -> Replace a
+replace old new
+  | old == new = Keep
+  | otherwise  = Replace { old, new }
+
+instance semigroupReplace :: Semigroup (Replace a) where
+  append Keep p = p
+  append p Keep = p
+  append (Replace { old: _m, new }) (Replace { old, new: _m' }) =
+    -- assert _m == _m'
+    Replace { old, new }
+
+instance semigroupMonoid :: Monoid (Replace a) where
+  mempty = Keep
+
+applyReplace :: forall a. Eq a => Replace a -> a -> a
+applyReplace Keep a = a
+applyReplace (Replace { old, new }) a
+  | a == old  = new
+  | otherwise = a
+
+-- Representing a PatchSet as `Map a Boolean` would have the advantage
+-- of enforcing rem and add to be disjoint.
+newtype PatchSet a = PatchSet
+  { rem :: Set a
+  , add :: Set a
+  }
+
+instance semigroupPatchSet :: Ord a => Semigroup (PatchSet a) where
+  append (PatchSet p) (PatchSet q) = PatchSet
+    { rem: q.rem <> p.rem
+    , add: Set.difference q.add p.rem <> p.add
+    }
+
+instance monoidPatchSet :: Ord a => Monoid (PatchSet a) where
+  mempty = PatchSet { rem: Set.empty, add: Set.empty }
+
+applyPatchSet :: forall a. Ord a => PatchSet a -> Set a -> Set a
+applyPatchSet (PatchSet p) s = Set.difference s p.rem <> p.add
+
+patchSetFromMap :: forall a. Ord a => Map a Boolean -> PatchSet a
+patchSetFromMap m = PatchSet { rem: Map.keys (Map.filter not m)
+                             , add: Map.keys (Map.filter identity m) }
+  -- TODO Map.partition would be nice here
+
+newtype NgramsPatch = NgramsPatch
+  { patch_children :: PatchSet NgramsTerm
+  , patch_list     :: Replace TermList
+  }
+
+instance semigroupNgramsPatch :: Semigroup NgramsPatch where
+  append (NgramsPatch p) (NgramsPatch q) = NgramsPatch
+    { patch_children: p.patch_children <> q.patch_children
+    , patch_list:     p.patch_list     <> q.patch_list
+    }
+
+instance monoidNgramsPatch :: Monoid NgramsPatch where
+  mempty = NgramsPatch { patch_children: mempty, patch_list: mempty }
+
+applyNgramsPatch :: NgramsPatch -> NgramsElement -> NgramsElement
+applyNgramsPatch (NgramsPatch p) (NgramsElement e) = NgramsElement
+  { ngrams:      e.ngrams
+  , list:        applyReplace p.patch_list e.list
+  , occurrences: e.occurrences -- TODO: is this correct ?
+  , parent:      e.parent
+  , children:    applyPatchSet p.patch_children e.children
+  }
+
+newtype PatchMap k p = PatchMap (Map k p)
+
+instance semigroupPatchMap :: (Ord k, Semigroup p) => Semigroup (PatchMap k p) where
+  append (PatchMap p) (PatchMap q) = PatchMap (Map.unionWith append p q)
+
+instance monoidPatchMap :: (Ord k, Semigroup p) => Monoid (PatchMap k p) where
+  mempty = PatchMap Map.empty
+
+derive instance newtypePatchMap :: Newtype (PatchMap k p) _
+
+_PatchMap :: forall k p. Iso' (PatchMap k p) (Map k p)
+_PatchMap = _Newtype
+
+instance functorPatchMap :: Functor (PatchMap k) where
+  map f (PatchMap m) = PatchMap (map f m)
+
+instance functorWithIndexPatchMap :: FunctorWithIndex k (PatchMap k) where
+  mapWithIndex f (PatchMap m) = PatchMap (mapWithIndex f m)
+
+instance foldlablePatchMap :: Foldable (PatchMap k) where
+  foldr f z (PatchMap m) = foldr f z m
+  foldl f z (PatchMap m) = foldl f z m
+  foldMap f (PatchMap m) = foldMap f m
+
+instance foldlableWithIndexPatchMap :: FoldableWithIndex k (PatchMap k) where
+  foldrWithIndex f z (PatchMap m) = foldrWithIndex f z m
+  foldlWithIndex f z (PatchMap m) = foldlWithIndex f z m
+  foldMapWithIndex f (PatchMap m) = foldMapWithIndex f m
+
+instance traversablePatchMap :: Traversable (PatchMap k) where
+  traverse f (PatchMap m) = PatchMap <$> traverse f m
+  sequence (PatchMap m) = PatchMap <$> sequence m
+
+instance traversableWithIndexPatchMap :: TraversableWithIndex k (PatchMap k) where
+  traverseWithIndex f (PatchMap m) = PatchMap <$> traverseWithIndex f m
+
+applyPatchMap :: forall k p v. Ord k => (p -> v -> v) -> PatchMap k p -> Map k v -> Map k v
+applyPatchMap applyPatchValue (PatchMap p) = mapWithIndex f
+  where
+    f k v =
+      case Map.lookup k p of
+        Nothing -> v
+        Just pv -> applyPatchValue pv v
+
+type NgramsTablePatch = PatchMap NgramsTerm NgramsPatch
+
+type ReParent a = forall m. MonadState NgramsTable m => a -> m Unit
+
+reParent :: Maybe NgramsTerm -> ReParent NgramsTerm
+reParent parent child =
+  at child <<< _Just <<< _NgramsElement <<< _parent .= parent
+
+-- reParentNgramsPatch :: NgramsTerm -> ReParent NgramsPatch
+-- ^ GHC would have accepted this type. Here reParentNgramsPatch checks but
+--   not its usage in reParentNgramsTablePatch.
+reParentNgramsPatch :: forall m. MonadState NgramsTable m
+                    => NgramsTerm -> NgramsPatch -> m Unit
+reParentNgramsPatch parent (NgramsPatch {patch_children: PatchSet {rem, add}}) = do
+  traverse_ (reParent Nothing) rem
+  traverse_ (reParent $ Just parent) add
+
+reParentNgramsTablePatch :: ReParent NgramsTablePatch
+reParentNgramsTablePatch = void <<< traverseWithIndex reParentNgramsPatch
+
+applyNgramsTablePatch :: NgramsTablePatch -> NgramsTable -> NgramsTable
+applyNgramsTablePatch p (NgramsTable m) =
+  execState (reParentNgramsTablePatch p) $
+  NgramsTable $ applyPatchMap applyNgramsPatch p m
+    -- TODO: update the .root fields...
+    -- See ROOT-UPDATE
+
+type State =
+  { ngramsTablePatch :: NgramsTablePatch
+  , ngramsParent     :: Maybe NgramsTerm -- Nothing means we are not currently grouping terms
+  , ngramsChildren   :: Map NgramsTerm Boolean
+                     -- ^ Used only when grouping.
+                     --   This updates the children of `ngramsParent`,
+                     --   ngrams set to `true` are to be added, and `false` to
+                     --   be removed.
+  , searchQuery      :: String
+  , termListFilter   :: Maybe TermList -- Nothing means all
+  , termTypeFilter   :: Maybe TermType -- Nothing means all
+  }
+
+_ngramsChildren = prop (SProxy :: SProxy "ngramsChildren")
+
+initialState :: forall props. props -> State
+initialState _ =
+  { ngramsTablePatch: mempty
+  , ngramsParent:     Nothing
+  , ngramsChildren:   mempty
+  , searchQuery:      ""
+  , termListFilter:   Nothing
+  , termTypeFilter:   Nothing
+  }
+
+data Action
+  = SetTermListItem NgramsTerm (Replace TermList)
+  | SetParentResetChildren (Maybe NgramsTerm)
+  -- ^ This sets `ngramsParent` and resets `ngramsChildren`.
+  | ToggleChild Boolean NgramsTerm
+  -- ^ Toggles the NgramsTerm in the `PatchSet` `ngramsChildren`.
+  -- If the `Boolean` is `true` it means we want to add it if it is not here,
+  -- if it is `false` it is meant to be removed if not here.
+  | AddTermChildren -- NgramsTable
+  -- ^ The NgramsTable argument is here as a cache of `ngramsTablePatch`
+  -- applied to `initTable`.
+  -- TODO more docs
+  | SetTermListFilter (Maybe TermList)
+  | SetTermTypeFilter (Maybe TermType)
+  | SetSearchQuery String
+
+data Mode = Authors | Sources | Institutes | Terms
+
+derive instance eqMode :: Eq Mode
+
+type Dispatch = Action -> Effect Unit
+
+tableContainer :: { searchQuery :: String
+                  , dispatch :: Dispatch
+                  , ngramsParent :: Maybe NgramsTerm
+                  , ngramsChildren :: Map NgramsTerm Boolean
+                  , ngramsTable :: NgramsTable
+                  }
+               -> T.TableContainerProps -> Array ReactElement
+tableContainer {searchQuery, dispatch, ngramsParent, ngramsChildren, ngramsTable: ngramsTableCache} props =
+  [ div [className "container-fluid"]
+    [ div [className "jumbotron1"]
+      [ div [className "row"]
+        [ div [className "panel panel-default"]
+          [ div [className "panel-heading"]
+            [ h2 [className "panel-title", style {textAlign : "center"}]
+              [ span [className "glyphicon glyphicon-hand-down"] []
+              , text "Extracted Terms"
+              ]
+            , div [className "row"]
+              [ div [className "savediv pull-left col-md-2", style { marginTop :"1.5em"}]
+                [ span [className "needsaveicon glyphicon glyphicon-import"] []
+                , button [_id "ImportListOrSaveAll", className "btn btn-warning", style {fontSize : "120%"}]
+                  [ text "Import a Termlist" ]
+                ]
+              , div [className "col-md-4", style {marginTop : "37px"}]
+                [ input [ className "form-control "
+                        , _id "id_password"
+                        , name "search", placeholder "Search"
+                        , _type "value"
+                        , value searchQuery
+                        , onInput \e -> dispatch (SetSearchQuery (unsafeEventValue e))
+                        ]
+                ]
+              , div [_id "filter_terms", className "col-md-6", style{ marginTop : "2.1em",paddingLeft :"1em"}]
+                [ div [className "row", style {marginTop : "6px"}]
+                  [ div [className "col-md-3"]
+                    [ select  [ _id "picklistmenu"
+                              , className "form-control custom-select"
+                              , onChange (\e -> dispatch (SetTermListFilter $ readTermList $ unsafeEventValue e))
+                              ] $ map optps1 termLists
+                    ]
+                  , div [className "col-md-3"]
+                    [ select  [ _id "picktermtype"
+                              , className "form-control custom-select"
+                              , style {marginLeft : "1em"}
+                              , onChange (\e -> dispatch (SetTermTypeFilter $ readTermType $ unsafeEventValue e))
+                              ] $ map optps1 termTypes
+                    ]
+                  , div [className "col-md-3"] [ props.pageSizeControl ]
+                  ]
+                ]
+              , div [className "col-md-6", style {marginTop : "24px", marginBottom : "14px"}]
+                [ props.pageSizeDescription
+                , props.paginationLinks
+                ]
+              ]
+            ]
+          , div [] (maybe [] (\ngrams ->
+              let
+                ngramsTable =
+                  ngramsTableCache # at ngrams
+                                 <<< _Just
+                                 <<< _NgramsElement
+                                 <<< _children
+                                 %~ applyPatchSet (patchSetFromMap ngramsChildren)
+                ngramsClick child
+                  | child == ngrams = Nothing
+                  | otherwise       = Just $ dispatch $ ToggleChild false child
+              in
+              [ p[] [text $ "Editing " <> ngrams]
+              , renderNgramsTree { ngramsTable, ngrams, ngramsStyle: [], ngramsClick }
+              , button [className "btn btn-primary", onClick $ const $ dispatch $ AddTermChildren] [text "Save"]
+              , button [className "btn btn-secondary", onClick $ const $ dispatch $ SetParentResetChildren Nothing] [text "Cancel"]
+              ]) ngramsParent)
+          , div [ _id "terms_table", className "panel-body" ]
+                [ table [ className "table able table-bordered" ]
+                  [ thead [ className "tableHeader table-bordered"] [props.tableHead]
+                  , tbody [] props.tableBody
+                  ]
+                ]
+          ]
+        ]
+      ]
+    ]
+  ]
+
+commitPatch :: NgramsTablePatch -> StateCoTransformer State Unit
+commitPatch pt = modifyState_ $ \s -> s { ngramsTablePatch = pt <> s.ngramsTablePatch }
+
+toggleMap :: forall a. a -> Maybe a -> Maybe a
+toggleMap _ (Just _) = Nothing
+toggleMap b Nothing  = Just b
+
+ngramsTableSpec' :: Spec State Props' Action
+ngramsTableSpec' = simpleSpec performAction render
+  where
+    setParentResetChildren :: Maybe NgramsTerm -> State -> State
+    setParentResetChildren p = _ { ngramsParent = p, ngramsChildren = mempty }
+
+    performAction :: PerformAction State Props' Action
+    performAction (SetTermListFilter c) _ _ = modifyState_ $ _ { termListFilter = c }
+    performAction (SetTermTypeFilter c) _ _ = modifyState_ $ _ { termTypeFilter = c }
+    performAction (SetSearchQuery s) _ _ = modifyState_ $ _ { searchQuery = s }
+    performAction (SetParentResetChildren p) _ _ =
+      modifyState_ $ setParentResetChildren p
+    performAction (ToggleChild b c) _ _ =
+      modifyState_ $ _ngramsChildren <<< at c %~ toggleMap b
+    performAction (SetTermListItem n pl) _ _ = commitPatch pt
+      where
+        pe = NgramsPatch { patch_list: pl, patch_children: mempty }
+        pt = PatchMap $ Map.singleton n pe
+    performAction AddTermChildren _ {ngramsParent: Nothing} =
+        -- impossible but harmless
+        pure unit
+    performAction AddTermChildren _
+                  { ngramsParent: Just parent
+                  , ngramsChildren
+                  , ngramsTablePatch
+                  } = do
+        modifyState_ $ setParentResetChildren Nothing
+        commitPatch pt
+      where
+        pc = patchSetFromMap ngramsChildren
+        pe = NgramsPatch { patch_list: mempty, patch_children: pc }
+        pt = PatchMap $ Map.fromFoldable [Tuple parent pe]
+        -- TODO ROOT-UPDATE
+        -- patch the root of the child to be equal to the root of the parent.
+
+    render :: Render State Props' Action
+    render dispatch { path: {nodeId, mode}
+                    , loaded: initTable
+                    , dispatch: loaderDispatch }
+                    { ngramsTablePatch, ngramsParent, ngramsChildren, searchQuery }
+                    _reactChildren =
+      [ T.tableElt
+          { rows
+          , setParams: \params -> loaderDispatch (Loader.SetPath {nodeId, params, mode})
+          , container: tableContainer {searchQuery, dispatch, ngramsParent, ngramsChildren, ngramsTable}
+          , colNames:
+              T.ColumnName <$>
+              [ "Graph"
+              , "Stop"
+              , "Terms"
+              , "Occurences (nb)"
+              ]
+          , totalRecords: 47361 -- TODO
+          }
+      ]
+          where
+            ngramsTable = applyNgramsTablePatch ngramsTablePatch initTable
+            rows = convertRow <$> Map.toUnfoldable (Map.filter displayRow (ngramsTable ^. _NgramsTable))
+            isRoot (NgramsElement e) = e.parent == Nothing
+            -- TODO: There is a missing case where we display a row that we should not.
+            -- Assumptions:
+            --   * cats -> cat -> animal
+            --   * We are editing cats: ngramsParent == Just "cats"
+            --   * animal should not be listed since this would create a cycle!
+            displayRow e@(NgramsElement {ngrams, children, parent}) =
+              isRoot e
+                -- ^ Display only nodes with parents
+                      && (ngramsChildren ^. at ngrams /= Just true)
+                      -- ^ and which are not scheduled to be added already.
+                      && (case ngramsParent of
+                            Just p ->
+                              ngrams /= p &&
+                              -- ^ and which is not the node being currently edited.
+                              not (Set.member p children)
+                              -- ^ ... or one of its children.
+                            Nothing -> true)
+              || -- Unless they are scheduled to be removed.
+                 (ngramsChildren ^. at ngrams == Just false)
+            convertRow (Tuple ngrams (NgramsElement { occurrences, list })) =
+              { row:
+                  renderNgramsItem { ngramsTable, ngrams, occurrences, ngramsParent, termList: list, dispatch }
+              , delete: false
+              }
+
+initialPageParams :: Int -> Mode -> PageParams
+initialPageParams nodeId mode = {nodeId, params: T.initialParams, mode}
+
+type PageLoaderProps =
+  { path :: PageParams
+--, corpusInfo :: Maybe (NodePoly CorpusInfo)
+  }
+
+getTable :: TabType -> Maybe Int -> Aff NgramsTable
+getTable tab = get <<< toUrl Back (Ngrams tab Nothing)
+
+modeTabType :: Mode -> TabType
+modeTabType Authors = TabAuthors
+modeTabType Sources = TabSources
+modeTabType Institutes = TabInstitutes
+modeTabType Terms = TabTerms
+
+loadPage :: PageParams -> Aff NgramsTable
+loadPage {nodeId, mode} = getTable (modeTabType mode) (Just nodeId) -- TODO this ignores params
+
+ngramsLoaderClass :: Loader.LoaderClass PageParams NgramsTable
+ngramsLoaderClass = Loader.createLoaderClass "NgramsLoader" loadPage
+
+ngramsLoader :: Loader.Props' PageParams NgramsTable -> ReactElement
+ngramsLoader props = React.createElement ngramsLoaderClass props []
+
+ngramsTableSpec :: Spec {} Props Void
+ngramsTableSpec = simpleSpec defaultPerformAction render
+  where
+    render :: Render {} Props Void
+    render _ {path: nodeId, mode} _ _ =
+      -- TODO: ignored ignored loaded: corpusInfo
+      [ ngramsLoader { path: initialPageParams nodeId mode
+                     , component: createClass "NgramsTableLayout" ngramsTableSpec' initialState
+                     } ]
+
+tree :: { ngramsTable :: NgramsTable
+        , ngramsStyle :: Array DOM.Props
+        , ngramsClick :: NgramsTerm -> Maybe (Effect Unit)
+        } -> NgramsTerm -> ReactElement
+tree params@{ngramsTable, ngramsStyle, ngramsClick} label =
+  li [ style {width : "100%"} ]
+     [ i icon []
+     , tag [text $ " " <> label]
+     , forest cs
+     ]
+  where
+    tag =
+      case ngramsClick label of
+        Just effect ->
+          a (ngramsStyle <> [onClick $ const effect])
+        Nothing ->
+          span ngramsStyle
+    leaf = List.null cs
+    icon = gray <> [className $ "fas fa-caret-" <> if open then "down" else "right"]
+    open = not leaf || false {- TODO -}
+    gray = if leaf then [style {color: "#adb5bd"}] else []
+    cs   = ngramsTable ^.. ix label <<< _NgramsElement <<< _children <<< folded
+
+    forest = ul [] <<< map (tree params) <<< List.toUnfoldable
+
+renderNgramsTree :: { ngrams      :: NgramsTerm
+                    , ngramsTable :: NgramsTable
+                    , ngramsStyle :: Array DOM.Props
+                    , ngramsClick :: NgramsTerm -> Maybe (Effect Unit)
+                    } -> ReactElement
+renderNgramsTree { ngramsTable, ngrams, ngramsStyle, ngramsClick } =
+  ul [] [
+    span [className "tree"] [tree {ngramsTable, ngramsStyle, ngramsClick} ngrams]
+  ]
+
+renderNgramsItem :: { ngrams :: NgramsTerm
+                    , ngramsTable :: NgramsTable
+                    , occurrences :: Int
+                    , termList :: TermList
+                    , ngramsParent :: Maybe NgramsTerm
+                    , dispatch :: Action -> Effect Unit
+                    } -> Array ReactElement
+renderNgramsItem { ngramsTable, ngrams, occurrences, termList, ngramsParent, dispatch } =
+  [ checkbox GraphTerm
+  , checkbox StopTerm
+  , if ngramsParent == Nothing
+    then renderNgramsTree { ngramsTable, ngrams, ngramsStyle, ngramsClick }
+    else
+      a [onClick $ const $ dispatch $ ToggleChild true ngrams]
+        [ i [className "fas fa-plus"] []
+        , span ngramsStyle [text $ " " <> ngrams]
+        ]
+  , text $ show occurrences
+  ]
+  where
+    ngramsStyle = [termStyle termList]
+    ngramsClick = Just <<< dispatch <<< SetParentResetChildren <<< Just
+    checkbox termList' =
+      let chkd = termList == termList'
+          termList'' = if chkd then CandidateTerm else termList'
+      in
+      input
+        [ _type "checkbox"
+        , className "checkbox"
+        , checked chkd
+     -- , title "Mark as completed"
+        , onChange $ const $ setTermList (replace termList termList'')
+        ]
+
+    setTermList Keep = pure unit
+    setTermList rep@(Replace {old,new}) = dispatch $ SetTermListItem ngrams rep
+
+termStyle :: TermList -> DOM.Props
+termStyle GraphTerm     = style {color: "green"}
+termStyle StopTerm      = style {color: "red", textDecoration : "line-through"}
+termStyle CandidateTerm = style {color: "black"}
+
+optps1 :: forall a. Show a => { desc :: String, mval :: Maybe a } -> ReactElement
+optps1 { desc, mval } = option [value val] [text desc]
+  where
+    val = maybe "" show mval
+
+unsafeEventValue :: forall event. event -> String
+unsafeEventValue e = (unsafeCoerce e).target.value

src/Gargantext/Pages/Corpus/Tabs/Sources.purs

-module Gargantext.Pages.Corpus.Tabs.Sources where
-
-
-import Prelude hiding (div)
-import React.DOM (h3, text)
-import Thermite (Render, Spec, defaultPerformAction, simpleSpec)
-
-type State = {}
-
-initialState :: State
-initialState = {}
-
-type Action = Void
-
-sourceSpec :: Spec State {} Action
-sourceSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render State {} Action
-    render dispatch _ state _ =
-      [ h3 [] [text "Source view"]]

src/Gargantext/Pages/Corpus/Tabs/Specs.purs

@@ -6,39 +6,49 @@ import Data.List (fromFoldable)
 import Data.Tuple (Tuple(..))
 
 import Gargantext.Pages.Corpus.Tabs.Types (Props)
-import Gargantext.Pages.Corpus.Tabs.States (State(), _doclens, _sourcelens, _authorlens, _termslens, _tablens, initialState)
-import Gargantext.Pages.Corpus.Tabs.Actions (Action(), _docAction, _sourceAction, _authorAction, _termsAction, _tabAction)
+import Gargantext.Pages.Corpus.Tabs.States (State(), _doclens, _ngramsView, _tablens, initialState)
+import Gargantext.Pages.Corpus.Tabs.Actions (Action(), _docAction, _NgramViewA, _tabAction)
 
 import Gargantext.Pages.Corpus.Tabs.Documents as DV
-import Gargantext.Pages.Corpus.Tabs.Sources as SV
-import Gargantext.Pages.Corpus.Tabs.Authors as AV
-import Gargantext.Pages.Corpus.Tabs.Terms as TV
+import Gargantext.Pages.Corpus.Tabs.Ngrams.NgramsTable as NV
 import Gargantext.Components.Tab as Tab
 import Thermite (Spec, focus, hideState, cmapProps)
 
 
-pureTabs :: Spec {} Props Void
-pureTabs = hideState initialState statefulTabs
+-- pureTabs :: Spec {} Props Void
+-- pureTabs = hideState initialState statefulTabs
 
 statefulTabs :: Spec State Props Action
 statefulTabs =
   Tab.tabs _tablens _tabAction $ fromFoldable [ Tuple "Documents" docPageSpec
                                               , Tuple "Authors"   authorPageSpec
                                               , Tuple "Sources"   sourcePageSpec
+                                              , Tuple "Institutes" institutesPageSpec
                                               , Tuple "Terms"     termsPageSpec
+                                              , Tuple "Trash"     trashPageSpec
                                               ]
 
 docPageSpec :: Spec State Props Action
 docPageSpec = focus _doclens _docAction DV.layoutDocview
 
-authorPageSpec :: Spec State  Props Action
-authorPageSpec = cmapProps (const {}) (focus _authorlens _authorAction AV.authorSpec)
-              <> docPageSpec
+ngramsViewSpec :: {mode :: NV.Mode} -> Spec State Props Action
+ngramsViewSpec {mode} =
+  cmapProps (\{loaded, path, dispatch} -> {mode,loaded,path, dispatch})
+            (focus _ngramsView _NgramViewA NV.ngramsTableSpec)
+
+authorPageSpec :: Spec State Props Action
+authorPageSpec = ngramsViewSpec {mode: NV.Authors}
 
 sourcePageSpec :: Spec State Props Action
-sourcePageSpec = cmapProps (const {}) (focus _sourcelens _sourceAction SV.sourceSpec)
-              <> docPageSpec
+sourcePageSpec = ngramsViewSpec {mode: NV.Sources}
+
+institutesPageSpec :: Spec State Props Action
+institutesPageSpec = ngramsViewSpec {mode: NV.Institutes}
 
 termsPageSpec :: Spec State Props Action
-termsPageSpec = cmapProps (const {}) (focus _termslens _termsAction TV.termsSpec)
-             <> docPageSpec
+termsPageSpec = ngramsViewSpec {mode: NV.Terms}
+
+trashPageSpec :: Spec State Props Action
+trashPageSpec = focus _doclens _docAction DV.layoutDocview
+
+

src/Gargantext/Pages/Corpus/Tabs/States.purs

 module Gargantext.Pages.Corpus.Tabs.States where
 
 import Data.Lens (Lens', lens)
+import Gargantext.Prelude
 import Gargantext.Pages.Corpus.Tabs.Documents as D
-import Gargantext.Pages.Corpus.Tabs.Sources   as S
-import Gargantext.Pages.Corpus.Tabs.Authors   as A
-import Gargantext.Pages.Corpus.Tabs.Terms     as T
+import Gargantext.Pages.Corpus.Tabs.Ngrams.NgramsTable as N
 import Gargantext.Components.Tab as Tab
 
 
 type State =
   { docsView    :: D.State
-  , authorsView :: A.State
-  , sourcesView :: S.State
-  , termsView   :: T.State
+  , ngramsView  :: {} -- N.State TODO needed
   , activeTab   :: Int
   }
 
-initialState :: State
-initialState =
-  { docsView    : D.initialState
-  , authorsView : A.initialState
-  , sourcesView : S.initialState
-  , termsView   : T.initialState
-  , activeTab : 0
+initialState :: {} -> State
+initialState _ =
+  { docsView    :
+     { documentIdsToDelete : mempty
+     }
+  , ngramsView  : {} -- N.initialState
+  , activeTab   : 0
   }
 
 _doclens :: Lens' State D.State
 _doclens = lens (\s -> s.docsView) (\s ss -> s {docsView = ss})
 
-_authorlens :: Lens' State A.State
-_authorlens = lens (\s -> s.authorsView) (\s ss -> s {authorsView = ss})
-
-_sourcelens :: Lens' State S.State
-_sourcelens = lens (\s -> s.sourcesView) (\s ss -> s {sourcesView = ss})
-
-_termslens :: Lens' State T.State
-_termslens = lens (\s -> s.termsView) (\s ss -> s {termsView = ss})
+_ngramsView :: Lens' State {} -- N.State
+_ngramsView = lens (\s -> s.ngramsView) (\s ss -> s {ngramsView = ss})
 
 _tablens :: Lens' State Tab.State
 _tablens = lens (\s -> s.activeTab) (\s ss -> s {activeTab = ss})

src/Gargantext/Pages/Corpus/Tabs/Terms.purs

-module Gargantext.Pages.Corpus.Tabs.Terms where
-
-import Data.Array (fold)
-import Prelude hiding (div)
-import React.DOM (h3, text)
-import Thermite (PerformAction, Render, Spec, defaultPerformAction, simpleSpec)
-
-
-type State = {}
-
-initialState :: State
-initialState = {}
-
-type Action = Void
-
-termsSpec :: Spec State {} Action
-termsSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render State {} Action
-    render dispatch _ state _ =
-      [ h3 [] [text "Terms view"]]

src/Gargantext/Pages/Corpus/Tabs/Terms/NgramsItem.purs

-module Gargantext.Pages.Corpus.Tabs.Terms.NgramsItem where
-
-import Prelude
-
-import Data.Newtype (class Newtype, unwrap)
-import Data.Lens.Iso (re)
-import Data.Lens.Iso.Newtype (_Newtype)
-import React (ReactElement)
-import React.DOM (input, span, td, text, tr)
-import React.DOM.Props (_type, checked, className, onChange, style, title)
-import Thermite (PerformAction, Render, Spec, modifyState, simpleSpec, hideState, focusState)
-import Gargantext.Utils (getter, setter)
-
-newtype State = State
-  { term :: Term
-  }
-
-derive instance newtypeState :: Newtype State _
-
-initialState :: State
-initialState = State {term : Term {id : 10, term : "hello", occurrence : 10, _type : None, children : []}}
-
-newtype Term = Term {id :: Int, term :: String, occurrence :: Int, _type :: TermType, children :: Array Term}
-
-derive instance newtypeTerm :: Newtype Term _
-
-data TermType = MapTerm | StopTerm | None
-
-derive instance eqTermType :: Eq TermType
-
-instance showTermType :: Show TermType where
-  show MapTerm = "MapTerm"
-  show StopTerm = "StopTerm"
-  show None = "None"
-
-data Action
-  = SetMap Boolean
-  | SetStop Boolean
-
-ngramsItemSpec :: Spec {} {} Void
-ngramsItemSpec = hideState (unwrap initialState) $
-                 focusState (re _Newtype) $
-                 simpleSpec performAction render
-  where
-    performAction :: PerformAction State {} Action
-    performAction (SetMap b)   _ _ = void do
-      modifyState \(State s) -> State s {term = setter (_{_type = (if b then MapTerm else None)}) s.term}
-
-    performAction (SetStop b)   _ _ = void do
-        modifyState \(State s) -> State s {term = setter (_{_type = (if b then StopTerm else None)}) s.term}
-
-    render :: Render State {} Action
-    render dispatch _ (State state) _ =
-      [
-        tr []
-        [ td [] [ checkbox_map]
-        , td [] [ checkbox_stop]
-        , td [] [ dispTerm (getter _.term state.term)  (getter _._type state.term) ]
-        , td [] [ text $ show $ getter _.occurrence state.term]
-        ]
-      ]
-      where
-        checkbox_map =
-          input [ _type "checkbox"
-                , className "checkbox"
-                , checked $ getter _._type state.term == MapTerm
-                , title "Mark as completed"
-                , onChange $ dispatch <<< ( const $ SetMap $ not (getter _._type state.term == MapTerm))
-                ]
-        checkbox_stop =
-          input
-          [ _type "checkbox"
-          , className "checkbox"
-          , checked $ getter _._type state.term == StopTerm
-          , title "Mark as completed"
-          , onChange $ dispatch <<< ( const $ SetStop $ not (getter _._type state.term == StopTerm))
-          ]
-
-
-dispTerm :: String -> TermType -> ReactElement
-dispTerm term MapTerm = span [style {color :"green"}] [text $ term]
-dispTerm term StopTerm = span [style {color :"red", textDecoration : "line-through"}] [text $ term]
-dispTerm term None = span [style {color :"black"}] [text term]

src/Gargantext/Pages/Corpus/Tabs/Terms/NgramsTable.purs

-module Gargantext.Pages.Corpus.Tabs.Terms.NgramsTable where
-
-
-import Data.Array (filter, toUnfoldable)
-import Data.Either (Either(..))
-import Data.Newtype (class Newtype, unwrap)
-import Data.Lens (Lens', Prism', lens, over, prism)
-import Data.Lens.Iso (re)
-import Data.Lens.Iso.Newtype (_Newtype)
-import Data.List (List)
-import Data.Tuple (Tuple(..), uncurry)
-import Data.Void (Void)
-import Data.Unit (Unit)
-import Effect (Effect)
-import Gargantext.Pages.Corpus.Tabs.Terms.NgramsItem as NI
-import Prelude (class Eq, class Ord, class Show, map, show, void, ($), (*), (+), (-), (/), (<), (<>), (==), (>), (>=), pure, unit)
-import React (ReactElement)
-import React.DOM hiding (style, map)
-import React.DOM.Props (_id, _type, className, href, name, onChange, onClick, onInput, placeholder, scope, selected, style, value)
-import Thermite (PerformAction, Spec, _render, focus, foreach, modifyState, focusState, hideState)
-import Unsafe.Coerce (unsafeCoerce)
-
-newtype State = State
-  { items        :: List {}
-  , search       :: String
-  , selectString :: String
-  , totalPages   :: Int
-  , currentPage  :: Int
-  , pageSize     :: PageSizes
-  , totalRecords :: Int
-  }
-
-derive instance newtypeState :: Newtype State _
-
-initialState :: State
-initialState = State { items        : toUnfoldable [{}]
-                     , search       : ""
-                     , selectString : ""
-                     , totalPages   : 10
-                     , currentPage  : 1
-                     , pageSize     : PS10
-                     , totalRecords : 100
-                     }
-
-data Action
-  = ItemAction Int Void
-  | ChangeString String
-  | SetInput String
-  | ChangePageSize PageSizes
-  | ChangePage Int
-
-_itemsList :: Lens' State (List {})
-_itemsList = lens (\(State s) -> s.items) (\(State s) v -> State s { items = v })
-
-_ItemAction :: Prism' Action (Tuple Int Void)
-_ItemAction = prism (uncurry ItemAction) \ta ->
-  case ta of
-    ItemAction i a -> Right (Tuple i a)
-    _ -> Left ta
-
-type Dispatch = Action -> Effect Unit
-
-{-
-performAction :: PerformAction State {} Action
-
-performAction (ChangePageSize ps) _ _ = void $ modifyState $ changePageSize ps
-
-performAction (ChangePage p) _ _ = void  do
-  modifyState \(State state) -> State $ state {currentPage = p}
-
-
-
-performAction (ChangeString c) _ _ = void do
-  modifyState \(State state) -> State $ state { selectString = c }
-
-
-performAction (SetInput s) _ _ = void do
-  modifyState \(State state) -> State $ state { search = s }
-
-performAction _ _ _ = pure unit
--}
-
-tableSpec :: Spec State {} Action -> Spec State {} Action
-tableSpec = over _render \render dispatch p (State s) c ->
-  [div [className "container-fluid"]
-     [
-       div [className "jumbotron1"]
-       [ div [className "row"]
-         [ div [className "panel panel-default"]
-           [
-             div [className "panel-heading"]
-             [ h2 [className "panel-title", style {textAlign : "center"}]
-               [ span [className "glyphicon glyphicon-hand-down"] []
-               , text "Extracted Terms"
-               ]
-             , div [className "row"]
-               [
-                 div [className "savediv pull-left col-md-2", style { marginTop :"1.5em"}]
-               [ span [className "needsaveicon glyphicon glyphicon-import"] []
-               , button [_id "ImportListOrSaveAll", className "btn btn-warning", style {fontSize : "120%"}]
-                 [ text "Import a Termlist"
-                 ]
-               ]
-             ,div [className "col-md-4", style {marginTop : "37px"}]
-              [ input [className "form-control "
-                     , _id "id_password"
-                     , name "search", placeholder "Search"
-                     , _type "value"
-                     ,value s.search
-                     ,onInput \e -> dispatch (SetInput (unsafeEventValue e))
-                     ]
-                 ]
-
-
-             , div [_id "filter_terms", className "col-md-6", style{ marginTop : "2.1em",paddingLeft :"1em"}]
-               [ div [className "row", style {marginTop : "6px"}]
-                 [ div [className "col-md-3"]
-                   [ select [_id "picklistmenu"
-                        ,className "form-control custom-select"
-                        ,onChange (\e -> dispatch (ChangeString $ (unsafeCoerce e).target.value))
-                        ] $ map optps1 aryPSMap
-                   ]
-               , div [className "col-md-3"]
-                 [ select [_id "picktermtype",className "form-control custom-select",style {marginLeft : "1em"},onChange (\e -> dispatch (ChangeString $ (unsafeCoerce e).target.value)) ] $ map optps1 aryPS1
-                 ]
-               ,div [className "col-md-3"]
-                 [ sizeDD s.pageSize dispatch
-                 ]
-
-                 ]
-
-               ]
-
-              , div [className "col-md-6", style {marginTop : "24px", marginBottom : "14px"}]
-                [ textDescription s.currentPage s.pageSize s.totalRecords
-               , pagination dispatch s.totalPages s.currentPage
-                ]
-
-
-             ]
-           ]
-          ,  div [_id "terms_table", className "panel-body"] [table [ className "table able table-bordered"]
-           [ thead [ className "tableHeader table-bordered"]
-             [ tr []
-               [ th [ scope "col"] [ text "Map" ]
-               , th [ scope "col"] [ text "Stop"]
-               , th [ scope "col"] [ text "Terms"]
-               , th [ scope "col"] [ text "Occurences (nb)" ]
-               ]
-             ]
-           , tbody [] $  render dispatch p (State s) c
-           ]
-         ]
-       ]
-     ]
-  ]
- ]
- ]
-
-ngramsTableSpec :: Spec {} {} Void
-ngramsTableSpec =
-  hideState (unwrap initialState) $
-  focusState (re _Newtype) $
-  container $
-  tableSpec $
-  focus _itemsList _ItemAction $
-  foreach $ \ _ ->
-  NI.ngramsItemSpec
-
-container :: forall state props action. Spec state props action -> Spec state props action
-container = over _render \render d p s c ->
-  [ div [ className "container-fluid" ] $
-    (render d p s c)
-  ]
-
-
-
-aryPSMap :: Array String
-aryPSMap = ["All terms", "Map terms", "Stop terms", "Other terms"]
-
-aryPS1 :: Array String
-aryPS1 = ["All types","One-word terms", "Multi-word terms"]
-
-
-optps1 :: String -> ReactElement
-optps1 val = option [ value  val ] [text  val]
-
-unsafeEventValue :: forall event. event -> String
-unsafeEventValue e = (unsafeCoerce e).target.value
-
-
-
-
-changePageSize :: PageSizes -> State  -> State
-changePageSize ps (State td) =
-  State $ td { pageSize      = ps
-                 , totalPages    = td.totalRecords / pageSizes2Int ps
-                 , currentPage   = 1
-              }
-
-
-data PageSizes = PS10 | PS20 | PS50 | PS100
-
-derive instance eqPageSizes :: Eq PageSizes
-
-instance showPageSize :: Show PageSizes where
-  show PS10 = "10"
-  show PS20 = "20"
-  show PS50 = "50"
-  show PS100 = "100"
-
-pageSizes2Int :: PageSizes -> Int
-pageSizes2Int PS10 = 10
-pageSizes2Int PS20 = 20
-pageSizes2Int PS50 = 50
-pageSizes2Int PS100 = 100
-
-aryPS :: Array PageSizes
-aryPS = [PS10, PS20, PS50, PS100]
-
-string2PageSize :: String -> PageSizes
-string2PageSize "10" = PS10
-string2PageSize "20" = PS20
-string2PageSize "50" = PS50
-string2PageSize "100" = PS100
-string2PageSize _    = PS10
-
-sizeDD :: PageSizes -> Dispatch -> ReactElement
-sizeDD ps d
-  = p []
-    [ text "Show : "
-    , select [onChange (\e -> d (ChangePageSize $ string2PageSize $ (unsafeCoerce e).target.value))] $ map (optps ps) aryPS
-    ]
-
-optps :: PageSizes -> PageSizes -> ReactElement
-optps cv val = option [ selected (cv == val), value $ show val ] [text $ show val]
-
-
-textDescription :: Int -> PageSizes -> Int -> ReactElement
-textDescription currPage pageSize totalRecords
-  =  div [className "row1"]
-          [ div [className "col-md-6"]
-                [ text $ "Showing " <> show start <> " to " <> show end <> " of " <> show totalRecords ]
-          ]
-    where
-      start = (currPage - 1) * pageSizes2Int pageSize + 1
-      end' = currPage * pageSizes2Int pageSize
-      end  = if end' > totalRecords then totalRecords else end'
-
-
-pagination :: Dispatch -> Int -> Int -> ReactElement
-pagination d tp cp
-  = span [] $
-    [ text "Pages: "
-    , prev
-    , first
-    , ldots
-    ]
-    <>
-    lnums
-    <>
-    [b' [text $ " " <> show cp <> " "]]
-    <>
-    rnums
-    <>
-    [ rdots
-    , last
-    , next
-    ]
-    where
-      prev = if cp == 1 then
-               text " Previous "
-               else
-               span []
-               [ text " "
-               , a [ href "javascript:void()"
-                   , onClick (\e -> d $ ChangePage $ cp - 1)
-                   ] [text "Previous"]
-               , text " "
-               ]
-      next = if cp == tp then
-               text " Next "
-               else
-               span []
-               [ text " "
-               , a [ href "javascript:void()"
-                   , onClick (\e -> d $ ChangePage $ cp + 1)
-                   ] [text "Next"]
-               , text " "
-               ]
-      first = if cp == 1 then
-                text ""
-                else
-                span []
-                [ text " "
-                , a [ href "javascript:void()"
-                    , onClick (\e -> d $ ChangePage 1)
-                    ] [text "1"]
-                , text " "
-                ]
-      last = if cp == tp then
-               text ""
-             else
-               span []
-               [ text " "
-               , a [ href "javascript:void()"
-                   , onClick (\e -> d $ ChangePage tp)
-                   ] [text $ show tp]
-               , text " "
-               ]
-      ldots = if cp >= 5 then
-                text " ... "
-                else
-                text ""
-      rdots = if cp + 3 < tp then
-                text " ... "
-                else
-                text ""
-      lnums = map (\i -> fnmid d i) $ filter (1  < _) [cp - 2, cp - 1]
-      rnums = map (\i -> fnmid d i) $ filter (tp > _) [cp + 1, cp + 2]
-
-fnmid :: Dispatch -> Int -> ReactElement
-fnmid d i
-  = span []
-    [ text " "
-    , a [ href "javascript:void()"
-        , onClick (\e -> d $ ChangePage i)
-        ] [text $ show i]
-    , text " "
-    ]

src/Gargantext/Pages/Corpus/Tabs/Types.purs

@@ -5,6 +5,7 @@ import Data.Maybe (Maybe(..))
 --------------------------------------------------------
 import Gargantext.Prelude
 import Gargantext.Components.Node (NodePoly(..))
+import Gargantext.Components.Loader as Loader
 
 newtype CorpusInfo = CorpusInfo { title   :: String
                                 , desc    :: String
@@ -43,7 +44,8 @@ instance decodeCorpusInfo :: DecodeJson CorpusInfo where
     pure $ CorpusInfo {title, desc, query, authors, chart, totalRecords}
 
 -- TODO type Props = {nodeId :: Int, info :: Maybe (NodePoly CorpusInfo) }
-type Props = {path :: Int, loaded :: Maybe (NodePoly CorpusInfo) }
+type PropsRow = Loader.InnerPropsRow Int (NodePoly CorpusInfo) ()
+type Props = Record PropsRow
 
 -- TODO include Gargantext.Pages.Corpus.Tabs.States
 -- TODO include Gargantext.Pages.Corpus.Tabs.Actions

src/Gargantext/Pages/Home/Specs.purs

@@ -26,7 +26,7 @@ landingData FR = Fr.landingData
 landingData EN = En.landingData
 
 layoutLanding :: Lang -> Spec {} {} Void
-layoutLanding = hideState (unwrap initialState)
+layoutLanding = hideState (const $ unwrap initialState)
             <<< focusState (re _Newtype)
             <<< layoutLanding' <<< landingData
 

src/Gargantext/Pages/Layout.purs

@@ -11,7 +11,6 @@ import Gargantext.Pages.Corpus.Graph          as GE
 -- import Gargantext.Pages.Corpus.Tabs.Terms.NgramsTable as NG
 
 import Gargantext.Pages.Annuaire.User.Contacts as C
-import Gargantext.Pages.Annuaire   as Annuaire
 -- import Gargantext.Pages.Home as L
 -- import Gargantext.Pages.Layout.Specs.Search as S
 import Gargantext.Router (Routes(..))
@@ -21,12 +20,10 @@ dispatchAction :: forall ignored m.
                   (Action -> m Unit) -> ignored -> Routes -> m Unit
 
 dispatchAction dispatcher _ Home = do
-  dispatcher Initialize
   dispatcher $ SetRoute Home
   -- dispatcher $ LandingA TODO
 
 dispatchAction dispatcher _ Login = do
-  dispatcher Initialize
   dispatcher $ SetRoute Login
   -- dispatcher $ LoginA TODO
 
@@ -47,8 +44,7 @@ dispatchAction dispatcher _ (UserPage id) = do
   dispatcher $ UserPageA $ C.FetchContact id
 
 dispatchAction dispatcher _ (Annuaire id) = do
-  dispatcher $ SetRoute       $ Annuaire id
-  dispatcher $ AnnuaireAction $ Annuaire.Load id
+  dispatcher $ SetRoute $ Annuaire id
 
 dispatchAction dispatcher _ (Folder id) = do
   dispatcher $ SetRoute $ Folder id
@@ -57,13 +53,10 @@ dispatchAction dispatcher _ (Document n) = do
   dispatcher $ SetRoute $ Document n
   dispatcher $ DocumentViewA $ Document.Load n
 
-dispatchAction dispatcher _ PGraphExplorer = do
-  dispatcher $ SetRoute PGraphExplorer
-  dispatcher $ GraphExplorerA $ GE.LoadGraph "imtNew.json"
-
-dispatchAction dispatcher _ NGramsTable = do
-  dispatcher $ SetRoute NGramsTable
-  -- dispatcher $ NgramsA TODO
+dispatchAction dispatcher _ (PGraphExplorer nid) = do
+  dispatcher $ SetRoute $ PGraphExplorer nid
+  dispatcher $ GraphExplorerA $ GE.LoadGraph nid
+  --dispatcher $ GraphExplorerA $ GE.LoadGraph "imtNew.json"
 
 dispatchAction dispatcher _ Dashboard = do
   dispatcher $ SetRoute Dashboard

src/Gargantext/Pages/Layout/Actions.purs

@@ -6,8 +6,9 @@ import Control.Monad.Cont.Trans                        (lift)
 import Data.Either                                     (Either(..))
 import Data.Lens                                       (Prism', prism)
 import Effect.Class                                    (liftEffect)
-import Thermite                                        (PerformAction, modifyState)
+import Thermite                                        (PerformAction, modifyState, modifyState_)
 
+import Gargantext.Config (defaultRoot)
 import Gargantext.Components.Login                  as LN
 import Gargantext.Components.Modals.Modal              (modalShow)
 import Gargantext.Components.Tree                   as Tree
@@ -24,10 +25,8 @@ import Gargantext.Router                               (Routes)
 ------------------------------------------------------------------------
 
 data Action
-  = Initialize
-  | LoginA     LN.Action
+  = LoginA     LN.Action
   | SetRoute   Routes
-  | TreeViewA          Tree.Action
     | SearchA    S.Action
     | Search             String
     | AddCorpusA AC.Action
@@ -38,6 +37,7 @@ data Action
   | Go
   | ShowLogin
   | ShowAddcorpus
+  | ShowTree 
 
 
 performAction :: PerformAction AppState {} Action
@@ -46,6 +46,9 @@ performAction (SetRoute route)  _ _ = void do
 performAction (Search s)  _ _ = void do
   modifyState $ _ {search = s}
 
+performAction (ShowTree)  _ (state) = void do
+  modifyState $ _ {showTree = not (state.showTree)}
+
 performAction (ShowLogin)  _ _ = void do
   liftEffect $ modalShow "loginModal"
   modifyState $ _ {showLogin = true}
@@ -63,21 +66,11 @@ performAction Go  _ _ = void do
   --modifyState id
 ---------------------------------------------------------
 
-performAction Initialize  _ state = void do
-  _ <- logs "loading Initial nodes"
-  case state.initialized of
-    false -> do
-      lnodes <- lift $ Tree.loadDefaultNode
-      void $ modifyState $ _ { initialized = true, ntreeState = lnodes }
-    _ -> do
-      pure unit
-
 performAction (LoginA        _) _ _ = pure unit
 performAction (AddCorpusA    _) _ _ = pure unit
 performAction (SearchA       _) _ _ = pure unit
 performAction (UserPageA     _) _ _ = pure unit
 performAction (DocumentViewA _) _ _ = pure unit
-performAction (TreeViewA          _) _ _ = pure unit
 performAction (GraphExplorerA     _) _ _ = pure unit
 performAction (AnnuaireAction     _) _ _ = pure unit
 
@@ -119,12 +112,6 @@ _documentViewAction = prism DocumentViewA \action ->
     DocumentViewA caction -> Right caction
     _-> Left action
 
-_treeAction :: Prism' Action Tree.Action
-_treeAction = prism TreeViewA \action ->
-  case action of
-    TreeViewA caction -> Right caction
-    _-> Left action
-
 _graphExplorerAction :: Prism' Action GE.Action
 _graphExplorerAction = prism GraphExplorerA \action ->
   case action of

src/Gargantext/Pages/Layout/Specs.purs

@@ -11,6 +11,7 @@ import Thermite (Render, Spec, _render, defaultPerformAction, defaultRender, foc
 import Unsafe.Coerce (unsafeCoerce)
 
 import Gargantext.Prelude
+import Gargantext.Config (defaultRoot)
 import Gargantext.Components.Data.Lang (Lang(..))
 import Gargantext.Components.Login as LN
 import Gargantext.Components.Tree  as Tree
@@ -21,12 +22,12 @@ import Gargantext.Pages.Corpus     as Corpus
 import Gargantext.Pages.Corpus.Document as Annotation
 import Gargantext.Pages.Corpus.Dashboard as Dsh
 import Gargantext.Pages.Corpus.Graph as GE
-import Gargantext.Pages.Corpus.Tabs.Terms.NgramsTable as NG
+import Gargantext.Pages.Corpus.Tabs.Ngrams.NgramsTable as NG
 import Gargantext.Pages.Home as L
-import Gargantext.Pages.Layout.Actions (Action(..), _addCorpusAction, _documentViewAction, _graphExplorerAction, _loginAction, _searchAction, _treeAction, _userPageAction, performAction, _annuaireAction)
+import Gargantext.Pages.Layout.Actions (Action(..), _addCorpusAction, _documentViewAction, _graphExplorerAction, _loginAction, _searchAction, _userPageAction, performAction)
 import Gargantext.Pages.Layout.Specs.AddCorpus as AC
 import Gargantext.Pages.Layout.Specs.Search    as S
-import Gargantext.Pages.Layout.States (AppState, _addCorpusState, _documentViewState, _graphExplorerState, _loginState, _searchState, _treeState, _userPageState, _annuaireState)
+import Gargantext.Pages.Layout.States (AppState, _addCorpusState, _documentViewState, _graphExplorerState, _loginState, _searchState, _userPageState)
 import Gargantext.Router (Routes(..))
 
 layoutSpec :: Spec AppState {} Action
@@ -59,13 +60,11 @@ pagesComponent s = case s.currentRoute of
     selectSpec AddCorpus         = layout0 $ focus _addCorpusState _addCorpusAction AC.layoutAddcorpus
     selectSpec SearchView        = layout0 $ focus _searchState _searchAction  S.searchSpec
     selectSpec (Document i) = layout0 $ focus _documentViewState _documentViewAction  Annotation.docview
-    selectSpec PGraphExplorer    = focus _graphExplorerState _graphExplorerAction  GE.specOld
+    selectSpec (PGraphExplorer i)    = layout1 $  focus _graphExplorerState _graphExplorerAction  GE.specOld
     selectSpec Dashboard         = layout0 $ noState Dsh.layoutDashboard
     
-    selectSpec (Annuaire i)      = layout0 $ focus _annuaireState _annuaireAction A.layoutAnnuaire
+    selectSpec (Annuaire i)      = layout0 $ cmapProps (const {annuaireId: i}) $ noState A.layout
     selectSpec (UserPage i)      = layout0 $ focus _userPageState  _userPageAction  C.layoutUser
-    -- To be removed
-    selectSpec NGramsTable       = layout0 $ noState NG.ngramsTableSpec
 
     -- selectSpec _ = simpleSpec defaultPerformAction defaultRender
 
@@ -87,14 +86,17 @@ layout0 layout =
       cont $ fold
       [ withState \st ->
          if ((\(LN.State s) -> s.loginC) st.loginState == true)
-            then ls as
+            then ls $ cmapProps (const {root: defaultRoot}) as
             else outerLayout1
-      , rs bs      ]
-    ls   = over _render \render d p s c -> [ div [className "col-md-2" ] (render d p s c) ]
-    rs   = over _render \render d p s c -> [ div [className "col-md-10"] (render d p s c) ]
+      , rs bs      
+      ]
+    ls   = over _render \render d p s c -> [ 
+         div [ className "col-md-2"] (render d p s c)  
+      ]
+    rs   = over _render \render d p s c -> [ div [ className "col-md-10"] (render d p s c) ]
     cont = over _render \render d p s c -> [ div [className "row"      ] (render d p s c) ]
 
-    as = focus _treeState _treeAction Tree.treeview
+    as = noState Tree.treeview
 
     bs = innerLayout $ layout
 
@@ -107,13 +109,56 @@ layout0 layout =
         ]
       ]
 
+-- TODO avoid code duplication with layout0
+layout1 :: Spec AppState {} Action
+        -> Spec AppState {} Action
+layout1 layout =
+  fold
+  [ layoutSidebar divSearchBar
+  , outerLayout
+  , layoutFooter
+  ]
+  where
+    outerLayout1 = simpleSpec defaultPerformAction defaultRender
+    outerLayout :: Spec AppState {} Action
+    outerLayout =
+      cont $ fold
+      [ withState \st ->
+         if ((\(LN.State s) -> s.loginC) st.loginState == true)
+            then ls $ cmapProps (const {root: defaultRoot}) as
+            else outerLayout1
+      , rs bs      
+      ]
+    ls   = over _render \render d p s c -> [  
+      
+        button [onClick $ \e -> d ShowTree, className "btn btn-primary",style {position:"relative", top: "68px",left:"-264px",zIndex : "1000"}] [text "ShowTree"]
+      
+        , div [if (s.showTree) then className "col-md-2" else className "col-md-2"] if (s.showTree) then (render d p s c) else [] 
+      ]
+    rs   = over _render \render d p s c -> [ div [if (s.showTree) then className "col-md-10" else className "col-md-12"] (render d p s c) ]
+    cont = over _render \render d p s c -> [ div [className "row"      ] (render d p s c) ]
+
+    as = noState Tree.treeview
+
+    bs = innerLayout $ layout
+
+    innerLayout :: Spec AppState {} Action
+                -> Spec AppState {} Action
+    innerLayout = over _render \render d p s c ->
+      [  div [_id "page-wrapper"]
+        [
+          div [className "container-fluid"]  (render d p s c)
+        ]
+      ]
+
+
 layoutSidebar :: Spec AppState {} Action
               -> Spec AppState {} Action
 layoutSidebar = over _render \render d p s c ->
       [ div [ _id "dafixedtop"
             , className "navbar navbar-inverse navbar-fixed-top"
             , role "navigation"
-            ] [ div [className "container"]
+            ] [ div [className "container-fluid"]
                     [ div [ className "navbar-inner" ]
                           [ divLogo
                           ,  div [ className "collapse navbar-collapse"]
@@ -284,6 +329,7 @@ divDropdownRight d =
           -- else
          [text " Login / Signup"]
         ]
+      
      ]
 
 layoutFooter :: Spec AppState {} Action

src/Gargantext/Pages/Layout/States.purs

@@ -8,8 +8,6 @@ import Gargantext.Components.Login                  as LN
 import Gargantext.Components.Tree                   as Tree
 
 import Gargantext.Pages.Corpus.Document       as D
-import Gargantext.Pages.Annuaire                    as Annuaire
-import Gargantext.Pages.Corpus.Tabs.Documents as DV
 import Gargantext.Pages.Corpus.Graph     as GE
 import Gargantext.Pages.Annuaire.User.Contacts      as C
 import Gargantext.Pages.Layout.Specs.AddCorpus      as AC
@@ -20,17 +18,14 @@ type AppState =
   { currentRoute   :: Maybe Routes
   , loginState   :: LN.State
   , addCorpusState :: AC.State
-  , docViewState   :: DV.State
   , searchState    :: S.State
   , userPageState  :: C.State
   , documentState  :: D.State
-  , annuaireState  :: Annuaire.State
-  , ntreeState     :: Tree.State
   , search         :: String
   , showLogin      :: Boolean
   , showCorpus     :: Boolean
   , graphExplorerState  :: GE.State
-  , initialized    :: Boolean
+  , showTree :: Boolean
   }
 
 initAppState :: AppState
@@ -38,17 +33,14 @@ initAppState =
   { currentRoute   : Just Home
   , loginState     : LN.initialState
   , addCorpusState : AC.initialState
-  , docViewState   : DV.initialState
   , searchState    : S.initialState
   , userPageState  : C.initialState
-  , documentState  : D.initialState
-  , ntreeState     : Tree.exampleTree
-  , annuaireState  : Annuaire.initialState
+  , documentState  : D.initialState {}
   , search         : ""
   , showLogin      : false
   , showCorpus     : false
   , graphExplorerState : GE.initialState
-  , initialized    : false
+  , showTree : false
   }
 
 ---------------------------------------------------------
@@ -58,23 +50,14 @@ _loginState = lens (\s -> s.loginState) (\s ss -> s{loginState = ss})
 _addCorpusState :: Lens' AppState AC.State
 _addCorpusState = lens (\s -> s.addCorpusState) (\s ss -> s{addCorpusState = ss})
 
-_docViewState :: Lens' AppState DV.State
-_docViewState = lens (\s -> s.docViewState) (\s ss -> s{docViewState = ss})
-
 _searchState :: Lens' AppState S.State
 _searchState = lens (\s -> s.searchState) (\s ss -> s{searchState = ss})
 
 _userPageState :: Lens' AppState C.State
 _userPageState = lens (\s -> s.userPageState) (\s ss -> s{userPageState = ss})
 
-_annuaireState :: Lens' AppState Annuaire.State
-_annuaireState = lens (\s -> s.annuaireState) (\s ss -> s{annuaireState = ss})
-
 _documentViewState :: Lens' AppState D.State
 _documentViewState = lens (\s -> s.documentState) (\s ss -> s{documentState = ss})
 
-_treeState :: Lens' AppState Tree.State
-_treeState = lens (\s -> s.ntreeState) (\s ss -> s {ntreeState = ss})
-
 _graphExplorerState :: Lens' AppState GE.State
 _graphExplorerState = lens (\s -> s.graphExplorerState) (\s ss -> s{graphExplorerState = ss})

src/Gargantext/Router.purs

@@ -20,8 +20,7 @@ data Routes
     | Corpus           Int
       | AddCorpus
       | Document  Int
-      | PGraphExplorer
-      | NGramsTable
+      | PGraphExplorer Int
       | Dashboard
     | Annuaire         Int
       | UserPage       Int
@@ -33,10 +32,9 @@ routing =
   <|> AddCorpus        <$   route "addCorpus"
   <|> Folder           <$> (route "folder"   *> int)
   <|> Corpus           <$> (route "corpus"   *> int)
-    <|> NGramsTable  <$   route "ngrams"
-    <|> Document  <$> (route "document" *> int)
+    <|> Document     <$> (route "document" *> int)
     <|> Dashboard      <$   route "dashboard"
-    <|> PGraphExplorer <$   route "graph"
+    <|> PGraphExplorer <$>   (route "graph" *> int )
   <|> Annuaire         <$> (route "annuaire" *> int)
     <|> UserPage       <$> (route "user"     *> int)
   <|> Home             <$   lit ""
@@ -52,13 +50,12 @@ instance showRoutes :: Show Routes where
   show AddCorpus        = "AddCorpus"
   show SearchView       = "Search"
   show (UserPage i)     = "User"   <> show i
-  show (Document i)= "Document"
+  show (Document i)     = "Document"
   show (Corpus i)       = "Corpus" <> show i
-  show NGramsTable      = "NGramsTable"
   show (Annuaire i)     = "Annuaire" <> show i
   show (Folder   i)     = "Folder"   <> show i
   show Dashboard        = "Dashboard"
-  show PGraphExplorer   = "graphExplorer"
+  show (PGraphExplorer i)   = "graphExplorer" <> show i
   show Home             = "Home"
 
 

src/Gargantext/Types.purs

+module Gargantext.Types where
+
+import Data.Argonaut (class DecodeJson, decodeJson, (.?))
+import Data.Maybe (Maybe(..))
+import Gargantext.Prelude
+
+data TermType = MonoTerm | MultiTerm
+
+derive instance eqTermType :: Eq TermType
+
+instance showTermType :: Show TermType where
+  show MonoTerm  = "MonoTerm"
+  show MultiTerm = "MultiTerm"
+
+readTermType :: String -> Maybe TermType
+readTermType "MonoTerm"  = Just MonoTerm
+readTermType "MultiTerm" = Just MultiTerm
+readTermType _           = Nothing
+
+termTypes :: Array { desc :: String, mval :: Maybe TermType }
+termTypes = [ { desc: "All types",        mval: Nothing        }
+            , { desc: "One-word terms",   mval: Just MonoTerm  }
+            , { desc: "Multi-word terms", mval: Just MultiTerm }
+            ]
+
+data TermList = GraphTerm | StopTerm | CandidateTerm
+
+derive instance eqTermList :: Eq TermList
+
+instance decodeJsonTermList :: DecodeJson TermList where
+  decodeJson json = pure GraphTerm  -- TODO
+
+type ListTypeId = Int
+
+listTypeId :: TermList -> ListTypeId
+listTypeId GraphTerm     = 1
+listTypeId StopTerm      = 2
+listTypeId CandidateTerm = 3
+
+instance showTermList :: Show TermList where
+  show GraphTerm     = "Graph"
+  show StopTerm      = "Stop"
+  show CandidateTerm = "Candidate"
+
+readTermList :: String -> Maybe TermList
+readTermList "Graph"     = Just GraphTerm
+readTermList "Stop"      = Just StopTerm
+readTermList "Candidate" = Just CandidateTerm
+readTermList _           = Nothing
+
+termLists :: Array { desc :: String, mval :: Maybe TermList }
+termLists = [ { desc: "All terms",   mval: Nothing      }
+            , { desc: "Graph terms",   mval: Just GraphTerm   }
+            , { desc: "Stop terms",  mval: Just StopTerm  }
+            , { desc: "Candidate terms", mval: Just CandidateTerm }
+            ]
+

src/Main.purs

@@ -24,7 +24,7 @@ setUnsafeComponentWillMount = unsafeSet "unsafeComponentWillMount"
 
 main :: Effect Unit
 main = do
- case T.createReactSpec layoutSpec initAppState of
+ case T.createReactSpec layoutSpec (const initAppState) of
     { spec, dispatcher } -> void $ do
       let setRouting this = void $ do
             matches routing (routeHandler (dispatchAction (dispatcher this)))

yarn.lock

@@ -49,6 +49,13 @@ ansi-escapes@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
   integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
+ansi-gray@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -71,6 +78,11 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-wrap@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -101,6 +113,13 @@ arch@^2.1.0:
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
   integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
 
+archive-type@^3.0.0, archive-type@^3.0.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-3.2.0.tgz#9cd9c006957ebe95fadad5bd6098942a813737f6"
+  integrity sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=
+  dependencies:
+    file-type "^3.1.0"
+
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -109,12 +128,19 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
+  dependencies:
+    arr-flatten "^1.0.1"
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.1.0:
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
@@ -124,11 +150,21 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-differ@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
+
 array-filter@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
   integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
 
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+
 array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
@@ -139,6 +175,16 @@ array-reduce@~0.0.0:
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
   integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
 
+array-uniq@^1.0.0, array-uniq@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
+
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -170,6 +216,11 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
+async-each-series@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-1.1.0.tgz#f42fd8155d38f21a5b8ea07c28e063ed1700b138"
+  integrity sha1-9C/YFV048hpbjqB8KOBj7RcAsTg=
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -975,11 +1026,65 @@ batch-processor@^1.0.0:
   resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
   integrity sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=
 
+beeper@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
+  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
+
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
   integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
+bin-build@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-2.2.0.tgz#11f8dd61f70ffcfa2bdcaa5b46f5e8fedd4221cc"
+  integrity sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw=
+  dependencies:
+    archive-type "^3.0.1"
+    decompress "^3.0.0"
+    download "^4.1.2"
+    exec-series "^1.0.0"
+    rimraf "^2.2.6"
+    tempfile "^1.0.0"
+    url-regex "^3.0.0"
+
+bin-check@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-2.0.0.tgz#86f8e6f4253893df60dc316957f5af02acb05930"
+  integrity sha1-hvjm9CU4k99g3DFpV/WvAqywWTA=
+  dependencies:
+    executable "^1.0.0"
+
+bin-version-check@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-2.1.0.tgz#e4e5df290b9069f7d111324031efc13fdd11a5b0"
+  integrity sha1-5OXfKQuQaffRETJAMe/BP90RpbA=
+  dependencies:
+    bin-version "^1.0.0"
+    minimist "^1.1.0"
+    semver "^4.0.3"
+    semver-truncate "^1.0.0"
+
+bin-version@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-1.0.4.tgz#9eb498ee6fd76f7ab9a7c160436f89579435d78e"
+  integrity sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144=
+  dependencies:
+    find-versions "^1.0.0"
+
+bin-wrapper@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-3.0.2.tgz#67d3306262e4b1a5f2f88ee23464f6a655677aeb"
+  integrity sha1-Z9MwYmLksaXy+I7iNGT2plVneus=
+  dependencies:
+    bin-check "^2.0.0"
+    bin-version-check "^2.1.0"
+    download "^4.0.0"
+    each-async "^1.1.1"
+    lazy-req "^1.0.0"
+    os-filter-obj "^1.0.0"
+
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
@@ -1011,6 +1116,15 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -1187,7 +1301,7 @@ buffer-alloc-unsafe@^1.1.0:
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
   integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
 
-buffer-alloc@^1.1.0:
+buffer-alloc@^1.1.0, buffer-alloc@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
   integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
@@ -1195,7 +1309,7 @@ buffer-alloc@^1.1.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
-buffer-crc32@^0.2.5:
+buffer-crc32@^0.2.5, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
@@ -1210,6 +1324,16 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+buffer-to-vinyl@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz#00f15faee3ab7a1dda2cde6d9121bffdd07b2262"
+  integrity sha1-APFfruOreh3aLN5tkSG//dB7ImI=
+  dependencies:
+    file-type "^3.1.0"
+    readable-stream "^2.0.2"
+    uuid "^2.0.1"
+    vinyl "^1.0.0"
+
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1241,6 +1365,11 @@ build-purescript@^0.2.0:
     spawn-stack "^0.5.0"
     zen-observable "^0.6.1"
 
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
+
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -1271,6 +1400,19 @@ cached-path-relative@^1.0.0:
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
   integrity sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=
 
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+
 cancelable-pump@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/cancelable-pump/-/cancelable-pump-0.2.0.tgz#865665d4c23a69788d4bcdf498db740f1b230d57"
@@ -1285,7 +1427,22 @@ cancelable-pump@^0.4.0:
   dependencies:
     pump "^3.0.0"
 
-chalk@^1.1.3:
+capture-stack-trace@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
+  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
+
+caw@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/caw/-/caw-1.2.0.tgz#ffb226fe7efc547288dc62ee3e97073c212d1034"
+  integrity sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=
+  dependencies:
+    get-proxy "^1.0.1"
+    is-obj "^1.0.0"
+    object-assign "^3.0.0"
+    tunnel-agent "^0.4.0"
+
+chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -1360,6 +1517,26 @@ cli-cursor@^2.0.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+clone-stats@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
+  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
+
+clone@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
+
+clone@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+co@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78"
+  integrity sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1385,6 +1562,11 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -1405,6 +1587,13 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0:
     lodash.memoize "~3.0.3"
     source-map "~0.5.3"
 
+commander@~2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -1415,7 +1604,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.4.6, concat-stream@^1.6.1:
+concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.1:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -1446,6 +1635,11 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
+console-stream@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44"
+  integrity sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=
+
 constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -1456,6 +1650,13 @@ convert-source-map@^1.1.0, convert-source-map@^1.5.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
   integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=
 
+convert-source-map@^1.1.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+  dependencies:
+    safe-buffer "~5.1.1"
+
 convert-source-map@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
@@ -1494,6 +1695,13 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
+create-error-class@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -1563,11 +1771,23 @@ crypto-browserify@^3.0.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
+  dependencies:
+    array-find-index "^1.0.1"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
   integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
+dateformat@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
+  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
+
 debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -1582,11 +1802,81 @@ debug@^3.1.0:
   dependencies:
     ms "2.0.0"
 
+decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
+decompress-tar@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-3.1.0.tgz#217c789f9b94450efaadc5c5e537978fc333c466"
+  integrity sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=
+  dependencies:
+    is-tar "^1.0.0"
+    object-assign "^2.0.0"
+    strip-dirs "^1.0.0"
+    tar-stream "^1.1.1"
+    through2 "^0.6.1"
+    vinyl "^0.4.3"
+
+decompress-tarbz2@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz#8b23935681355f9f189d87256a0f8bdd96d9666d"
+  integrity sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=
+  dependencies:
+    is-bzip2 "^1.0.0"
+    object-assign "^2.0.0"
+    seek-bzip "^1.0.3"
+    strip-dirs "^1.0.0"
+    tar-stream "^1.1.1"
+    through2 "^0.6.1"
+    vinyl "^0.4.3"
+
+decompress-targz@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-3.1.0.tgz#b2c13df98166268991b715d6447f642e9696f5a0"
+  integrity sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=
+  dependencies:
+    is-gzip "^1.0.0"
+    object-assign "^2.0.0"
+    strip-dirs "^1.0.0"
+    tar-stream "^1.1.1"
+    through2 "^0.6.1"
+    vinyl "^0.4.3"
+
+decompress-unzip@^3.0.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-3.4.0.tgz#61475b4152066bbe3fee12f9d629d15fe6478eeb"
+  integrity sha1-YUdbQVIGa74/7hL51inRX+ZHjus=
+  dependencies:
+    is-zip "^1.0.0"
+    read-all-stream "^3.0.0"
+    stat-mode "^0.2.0"
+    strip-dirs "^1.0.0"
+    through2 "^2.0.0"
+    vinyl "^1.0.0"
+    yauzl "^2.2.1"
+
+decompress@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/decompress/-/decompress-3.0.0.tgz#af1dd50d06e3bfc432461d37de11b38c0d991bed"
+  integrity sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=
+  dependencies:
+    buffer-to-vinyl "^1.0.0"
+    concat-stream "^1.4.6"
+    decompress-tar "^3.0.0"
+    decompress-tarbz2 "^3.0.0"
+    decompress-targz "^3.0.0"
+    decompress-unzip "^3.0.0"
+    stream-combiner2 "^1.1.1"
+    vinyl-assign "^1.0.1"
+    vinyl-fs "^2.2.0"
+
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
@@ -1738,13 +2028,59 @@ download-purescript@0.5.0-0:
     is-plain-obj "^1.1.0"
     zen-observable "^0.6.1"
 
-duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
+download@^4.0.0, download@^4.1.2:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/download/-/download-4.4.3.tgz#aa55fdad392d95d4b68e8c2be03e0c2aa21ba9ac"
+  integrity sha1-qlX9rTktldS2jowr4D4MKqIbqaw=
+  dependencies:
+    caw "^1.0.1"
+    concat-stream "^1.4.7"
+    each-async "^1.0.0"
+    filenamify "^1.0.1"
+    got "^5.0.0"
+    gulp-decompress "^1.2.0"
+    gulp-rename "^1.2.0"
+    is-url "^1.2.0"
+    object-assign "^4.0.1"
+    read-all-stream "^3.0.0"
+    readable-stream "^2.0.2"
+    stream-combiner2 "^1.1.1"
+    vinyl "^1.0.0"
+    vinyl-fs "^2.2.0"
+    ware "^1.2.0"
+
+duplexer2@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
+  dependencies:
+    readable-stream "~1.1.9"
+
+duplexer2@^0.1.2, duplexer2@^0.1.4, duplexer2@~0.1.0, duplexer2@~0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
   integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
   dependencies:
     readable-stream "^2.0.2"
 
+duplexify@^3.2.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
+  integrity sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+each-async@^1.0.0, each-async@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/each-async/-/each-async-1.1.1.tgz#dee5229bdf0ab6ba2012a395e1b869abf8813473"
+  integrity sha1-3uUim98KtrogEqOV4bhpq/iBNHM=
+  dependencies:
+    onetime "^1.0.0"
+    set-immediate-shim "^1.0.0"
+
 echarts-for-react@^2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/echarts-for-react/-/echarts-for-react-2.0.14.tgz#6df7a31eea43ef35321e20a5854109cbc52c9df3"
@@ -1809,6 +2145,13 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+error-ex@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
 es6-promise@^3.1.2:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
@@ -1842,6 +2185,14 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
+exec-series@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/exec-series/-/exec-series-1.0.3.tgz#6d257a9beac482a872c7783bc8615839fc77143a"
+  integrity sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo=
+  dependencies:
+    async-each-series "^1.1.0"
+    object-assign "^4.1.0"
+
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
@@ -1868,11 +2219,25 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+executable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/executable/-/executable-1.1.0.tgz#877980e9112f3391066da37265de7ad8434ab4d9"
+  integrity sha1-h3mA6REvM5EGbaNyZd562ENKtNk=
+  dependencies:
+    meow "^3.1.0"
+
 executing-npm-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/executing-npm-path/-/executing-npm-path-0.1.0.tgz#37199c565eb1f703533beca5eebb7f14ed082d2c"
   integrity sha512-NG/Pw0xD4KBcb5ilpZa57n7U17obIvZX1TCBLdv9M7Jd3wSsfU8BtMSy+EFkx9hhJsnIBBEmaPQd12dXWaxlHA==
 
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -1886,6 +2251,13 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
+  dependencies:
+    fill-range "^2.1.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -1901,6 +2273,18 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
+  dependencies:
+    is-extglob "^1.0.0"
+
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -1915,6 +2299,15 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+fancy-log@^1.1.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
+  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
+  dependencies:
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
+    time-stamp "^1.0.0"
+
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -1946,6 +2339,13 @@ fbjs@^0.8.9:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.9"
 
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  dependencies:
+    pend "~1.2.0"
+
 feint@1.0.2, feint@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/feint/-/feint-1.0.2.tgz#f4ac51d6ed7db2cc5a0ba6913f84d43f72dd680b"
@@ -1953,6 +2353,14 @@ feint@1.0.2, feint@^1.0.2:
   dependencies:
     append-type "^1.0.1"
 
+figures@^1.3.5:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
 file-to-tar@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/file-to-tar/-/file-to-tar-0.3.1.tgz#d5ccb4753c53f23245f7226a54cd85723d626c31"
@@ -1967,11 +2375,46 @@ file-to-tar@^0.3.1:
     tar-fs "^1.16.2"
     zen-observable "^0.6.1"
 
+file-type@^3.1.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
+  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
+
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
+
+filename-reserved-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
+  integrity sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=
+
+filenamify@^1.0.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5"
+  integrity sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=
+  dependencies:
+    filename-reserved-regex "^1.0.0"
+    strip-outer "^1.0.0"
+    trim-repeated "^1.0.0"
+
 filesize@^3.5.10:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
   integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
+fill-range@^2.1.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^3.0.0"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -1982,6 +2425,29 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+find-versions@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-1.2.1.tgz#cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"
+  integrity sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I=
+  dependencies:
+    array-uniq "^1.0.0"
+    get-stdin "^4.0.1"
+    meow "^3.5.0"
+    semver-regex "^1.0.0"
+
+first-chunk-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
+  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
+
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
@@ -1989,11 +2455,18 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "^3.1.0"
 
-for-in@^1.0.2:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
+  dependencies:
+    for-in "^1.0.1"
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -2050,6 +2523,18 @@ get-assigned-identifiers@^1.2.0:
   resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1"
   integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==
 
+get-proxy@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-1.1.0.tgz#894854491bc591b0f147d7ae570f5c678b7256eb"
+  integrity sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=
+  dependencies:
+    rc "^1.1.2"
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -2060,7 +2545,22 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-glob-parent@^3.1.0:
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
+  dependencies:
+    is-glob "^2.0.0"
+
+glob-parent@^3.0.0, glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
   integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
@@ -2068,6 +2568,31 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-stream@^5.3.2:
+  version "5.3.5"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
+  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=
+  dependencies:
+    extend "^3.0.0"
+    glob "^5.0.3"
+    glob-parent "^3.0.0"
+    micromatch "^2.3.7"
+    ordered-read-streams "^0.3.0"
+    through2 "^0.6.0"
+    to-absolute-glob "^0.1.1"
+    unique-stream "^2.0.2"
+
+glob@^5.0.3:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^7.0.5, glob@^7.1.0, glob@^7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -2085,11 +2610,106 @@ globals@^9.18.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
+glogg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
+  integrity sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==
+  dependencies:
+    sparkles "^1.0.0"
+
+got@^5.0.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35"
+  integrity sha1-X4FjWmHkplifGAVp6k44FoClHzU=
+  dependencies:
+    create-error-class "^3.0.1"
+    duplexer2 "^0.1.4"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    node-status-codes "^1.0.0"
+    object-assign "^4.0.1"
+    parse-json "^2.1.0"
+    pinkie-promise "^2.0.0"
+    read-all-stream "^3.0.0"
+    readable-stream "^2.0.5"
+    timed-out "^3.0.0"
+    unzip-response "^1.0.2"
+    url-parse-lax "^1.0.0"
+
+graceful-fs@^4.0.0:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+
+gulp-decompress@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gulp-decompress/-/gulp-decompress-1.2.0.tgz#8eeb65a5e015f8ed8532cafe28454960626f0dc7"
+  integrity sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=
+  dependencies:
+    archive-type "^3.0.0"
+    decompress "^3.0.0"
+    gulp-util "^3.0.1"
+    readable-stream "^2.0.2"
+
+gulp-rename@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd"
+  integrity sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==
+
+gulp-sourcemaps@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
+  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=
+  dependencies:
+    convert-source-map "^1.1.1"
+    graceful-fs "^4.1.2"
+    strip-bom "^2.0.0"
+    through2 "^2.0.0"
+    vinyl "^1.0.0"
+
+gulp-util@^3.0.1:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
+  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
+  dependencies:
+    array-differ "^1.0.0"
+    array-uniq "^1.0.2"
+    beeper "^1.0.0"
+    chalk "^1.0.0"
+    dateformat "^2.0.0"
+    fancy-log "^1.1.0"
+    gulplog "^1.0.0"
+    has-gulplog "^0.1.0"
+    lodash._reescape "^3.0.0"
+    lodash._reevaluate "^3.0.0"
+    lodash._reinterpolate "^3.0.0"
+    lodash.template "^3.0.0"
+    minimist "^1.1.0"
+    multipipe "^0.1.2"
+    object-assign "^3.0.0"
+    replace-ext "0.0.1"
+    through2 "^2.0.0"
+    vinyl "^0.5.0"
+
+gulplog@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
+  dependencies:
+    glogg "^1.0.0"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -2102,6 +2722,13 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-gulplog@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
+  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
+  dependencies:
+    sparkles "^1.0.0"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -2183,6 +2810,11 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
+hosted-git-info@^2.1.4:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
+
 htmlescape@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
@@ -2248,6 +2880,13 @@ imports-loader@^0.8.0:
     loader-utils "^1.0.2"
     source-map "^0.6.1"
 
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
+  dependencies:
+    repeating "^2.0.0"
+
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -2356,6 +2995,18 @@ invariant@^2.2.2:
   dependencies:
     loose-envify "^1.0.0"
 
+ip-regex@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
+  integrity sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=
+
+is-absolute@^0.1.5:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.1.7.tgz#847491119fccb5fb436217cc737f7faad50f603f"
+  integrity sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=
+  dependencies:
+    is-relative "^0.1.0"
+
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -2370,6 +3021,11 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
@@ -2382,6 +3038,18 @@ is-buffer@^1.1.0, is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-bzip2@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-bzip2/-/is-bzip2-1.0.0.tgz#5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"
+  integrity sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -2419,6 +3087,18 @@ is-dir@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-dir/-/is-dir-1.0.0.tgz#41d37f495fccacc05a4778d66e83024c292ba3ff"
   integrity sha1-QdN/SV/MrMBaR3jWboMCTCkro/8=
 
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
+  dependencies:
+    is-primitive "^2.0.0"
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -2431,6 +3111,11 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
+
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -2455,6 +3140,13 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
+  dependencies:
+    is-extglob "^1.0.0"
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -2469,6 +3161,23 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
+is-gzip@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
+  integrity sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=
+
+is-natural-number@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-2.1.1.tgz#7d4c5728377ef386c3e194a9911bf57c6dc335e7"
+  integrity sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=
+
+is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -2476,6 +3185,16 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -2488,16 +3207,71 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-stream@^1.0.1, is-stream@^1.1.0:
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
+
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
+
+is-relative@^0.1.0:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
+  integrity sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=
+
+is-retry-allowed@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
+
+is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-tar@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-tar/-/is-tar-1.0.0.tgz#2f6b2e1792c1f5bb36519acaa9d65c0d26fe853d"
+  integrity sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=
+
+is-url@^1.2.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
+  integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+
+is-valid-glob@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
+  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=
+
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
+is-zip@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-zip/-/is-zip-1.0.0.tgz#47b0a8ff4d38a76431ccfd99a8e15a4c86ba2325"
+  integrity sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -2548,6 +3322,13 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
+json-stable-stringify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+  dependencies:
+    jsonify "~0.0.0"
+
 json-stable-stringify@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
@@ -2613,6 +3394,18 @@ labeled-stream-splicer@^2.0.0:
     isarray "^2.0.4"
     stream-splicer "^2.0.0"
 
+lazy-req@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-1.1.0.tgz#bdaebead30f8d824039ce0ce149d4daa07ba1fac"
+  integrity sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=
+
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
+  dependencies:
+    readable-stream "^2.0.5"
+
 load-from-cwd-or-npm@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/load-from-cwd-or-npm/-/load-from-cwd-or-npm-2.2.2.tgz#86d21082f13c7cb4969ddeb90d0261c18b671e42"
@@ -2623,6 +3416,17 @@ load-from-cwd-or-npm@^2.2.1:
     optional "^0.1.4"
     resolve-from-npm "^2.0.4"
 
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
 load-request-from-cwd-or-npm@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/load-request-from-cwd-or-npm/-/load-request-from-cwd-or-npm-2.0.1.tgz#27a87ec70e56f20708280c8f42bc3b4ca3793a6e"
@@ -2639,16 +3443,120 @@ loader-utils@^1.0.2:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+
+lodash._basetostring@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
+  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
+
+lodash._basevalues@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
+  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+
+lodash._reescape@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
+  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
+
+lodash._reevaluate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
+  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
+
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
+lodash._root@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
+lodash.escape@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
+  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
+  dependencies:
+    lodash._root "^3.0.0"
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+
+lodash.isequal@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
 lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
+lodash.restparam@^3.0.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+
+lodash.template@^3.0.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
+  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash._basetostring "^3.0.0"
+    lodash._basevalues "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash._reinterpolate "^3.0.0"
+    lodash.escape "^3.0.0"
+    lodash.keys "^3.0.0"
+    lodash.restparam "^3.0.0"
+    lodash.templatesettings "^3.0.0"
+
+lodash.templatesettings@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
+  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.escape "^3.0.0"
+
 lodash@^4.17.4, lodash@latest:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
@@ -2670,6 +3578,19 @@ log-update@^2.3.0:
     cli-cursor "^2.0.0"
     wrap-ansi "^3.0.1"
 
+logalot@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552"
+  integrity sha1-X46MkNME7fElMJUaVVSruMXj9VI=
+  dependencies:
+    figures "^1.3.5"
+    squeak "^1.0.0"
+
+longest@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
@@ -2677,6 +3598,29 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
   dependencies:
     js-tokens "^3.0.0"
 
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
+lowercase-keys@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lpad-align@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/lpad-align/-/lpad-align-1.1.2.tgz#21f600ac1c3095c3c6e497ee67271ee08481fe9e"
+  integrity sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=
+  dependencies:
+    get-stdin "^4.0.1"
+    indent-string "^2.1.0"
+    longest "^1.0.0"
+    meow "^3.3.0"
+
 lru-cache@^4.0.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -2690,6 +3634,11 @@ map-cache@^0.2.2:
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -2697,6 +3646,11 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+math-random@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
+
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -2705,6 +3659,48 @@ md5.js@^1.3.4:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+meow@^3.1.0, meow@^3.3.0, meow@^3.5.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
+merge-stream@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
+micromatch@^2.3.7:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
 micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -2752,7 +3748,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -2764,7 +3760,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.0, minimist@^1.2.0:
+minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -2843,6 +3839,13 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
+multipipe@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
+  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
+  dependencies:
+    duplexer2 "0.0.2"
+
 mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -2940,6 +3943,11 @@ node-static@^0.7.9:
     mime "^1.2.9"
     optimist ">=0.3.4"
 
+node-status-codes@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
+  integrity sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -2948,7 +3956,17 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-path@^2.1.1:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
@@ -3006,7 +4024,17 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
+  integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=
+
+object-assign@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
+
+object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -3027,6 +4055,14 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -3041,6 +4077,11 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
+
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -3066,11 +4107,24 @@ optional@^0.1.4:
   resolved "https://registry.yarnpkg.com/optional/-/optional-0.1.4.tgz#cdb1a9bedc737d2025f690ceeb50e049444fd5b3"
   integrity sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw==
 
+ordered-read-streams@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
+  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s=
+  dependencies:
+    is-stream "^1.0.1"
+    readable-stream "^2.0.1"
+
 os-browserify@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54"
   integrity sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=
 
+os-filter-obj@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-1.0.3.tgz#5915330d90eced557d2d938a31c6dd214d9c63ad"
+  integrity sha1-WRUzDZDs7VV9LZOKMcbdIU2cY60=
+
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -3117,6 +4171,23 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-json@^2.1.0, parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -3132,6 +4203,13 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3152,6 +4230,15 @@ path-platform@~0.11.15:
   resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
   integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=
 
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 pbkdf2@^3.0.3:
   version "3.0.16"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
@@ -3163,6 +4250,28 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
 platform-name@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/platform-name/-/platform-name-1.0.0.tgz#3396ea7bfea3a68aedd13483e055100f9e609755"
@@ -3204,6 +4313,16 @@ prepare-write@^1.0.0:
     is-dir "^1.0.0"
     mkdirp "^0.5.1"
 
+prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
+
 private@^0.1.6, private@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -3248,6 +4367,17 @@ prop-types@^15.6.0:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+psc-package@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/psc-package/-/psc-package-0.3.2.tgz#09eab94d3df8881cd75597bdcf87afd542675922"
+  integrity sha512-DiSqtoFUEQn6MfeYm4SpuKK9+V4fFRlF2OI9xPud3WvvQuNDxP58bdoYBFfX9eu9n5xBnY8h/65hDDaZGQzBOg==
+  dependencies:
+    bin-build "^2.2.0"
+    bin-wrapper "^3.0.2"
+    logalot "^2.1.0"
+    rimraf "^2.6.1"
+    to-executable-name "^1.1.0"
+
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -3334,6 +4464,15 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
+randomatic@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
+  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
+  dependencies:
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
+
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
@@ -3356,7 +4495,7 @@ rate-map@^1.0.1:
   dependencies:
     append-type "^1.0.1"
 
-rc@^1.2.7:
+rc@^1.1.2, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -3399,6 +4538,14 @@ react@^16.4.2:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+read-all-stream@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
+  integrity sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=
+  dependencies:
+    pinkie-promise "^2.0.0"
+    readable-stream "^2.0.0"
+
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
@@ -3406,6 +4553,23 @@ read-only-stream@^2.0.0:
   dependencies:
     readable-stream "^2.0.2"
 
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
 read@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
@@ -3413,7 +4577,17 @@ read@^1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6:
+"readable-stream@>=1.0.33-1 <1.1.0-0":
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -3426,6 +4600,16 @@ readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -3472,6 +4656,14 @@ real-executable-path@^2.0.2:
   dependencies:
     real-executable-path-callback "^2.1.2"
 
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
 regenerate@^1.2.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
@@ -3491,6 +4683,13 @@ regenerator-transform@^0.10.0:
     babel-types "^6.19.0"
     private "^0.1.6"
 
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -3530,7 +4729,7 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.6.1:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -3542,6 +4741,11 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
+replace-ext@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
+  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
+
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -3591,7 +4795,7 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-rimraf@^2.5.2, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@^2.2.6, rimraf@^2.5.2, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
@@ -3643,6 +4847,35 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
+seek-bzip@^1.0.3:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
+  integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=
+  dependencies:
+    commander "~2.8.1"
+
+semver-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
+  integrity sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk=
+
+semver-truncate@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8"
+  integrity sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=
+  dependencies:
+    semver "^5.3.0"
+
+"semver@2 || 3 || 4 || 5":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
+semver@^4.0.3:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
+
 semver@^5.3.0, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
@@ -3653,7 +4886,7 @@ set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@^1.0.1:
+set-immediate-shim@^1.0.0, set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
   integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
@@ -3834,6 +5067,11 @@ sourcemap-codec@^1.3.0:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
   integrity sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==
 
+sparkles@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
+  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
+
 spawn-stack@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/spawn-stack/-/spawn-stack-0.5.0.tgz#67c2fea37d33405a934ef1c7bca3bf86b9f2d3d4"
@@ -3844,6 +5082,32 @@ spawn-stack@^0.5.0:
     inspect-with-kind "^1.0.4"
     zen-observable "^0.6.1"
 
+spdx-correct@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
+  integrity sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2"
+  integrity sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -3851,6 +5115,20 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
+squeak@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/squeak/-/squeak-1.3.0.tgz#33045037b64388b567674b84322a6521073916c3"
+  integrity sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=
+  dependencies:
+    chalk "^1.0.0"
+    console-stream "^0.1.1"
+    lpad-align "^1.0.1"
+
+stat-mode@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
+  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -3886,6 +5164,11 @@ stream-http@^2.0.0:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
+stream-shift@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
+
 stream-splicer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83"
@@ -3942,16 +5225,57 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-bom-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
+  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=
+  dependencies:
+    first-chunk-stream "^1.0.0"
+    strip-bom "^2.0.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-dirs@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-1.1.1.tgz#960bbd1287844f3975a4558aa103a8255e2456a0"
+  integrity sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=
+  dependencies:
+    chalk "^1.0.0"
+    get-stdin "^4.0.1"
+    is-absolute "^0.1.5"
+    is-natural-number "^2.0.0"
+    minimist "^1.1.0"
+    sum-up "^1.0.1"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
+  dependencies:
+    get-stdin "^4.0.1"
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
+strip-outer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
+  integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
@@ -3959,6 +5283,13 @@ subarg@^1.0.0:
   dependencies:
     minimist "^1.1.0"
 
+sum-up@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
+  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
+  dependencies:
+    chalk "^1.0.0"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -3988,6 +5319,19 @@ tar-fs@^1.16.0, tar-fs@^1.16.2:
     pump "^1.0.0"
     tar-stream "^1.1.2"
 
+tar-stream@^1.1.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.2.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.1"
+    xtend "^4.0.0"
+
 tar-stream@^1.1.2, tar-stream@^1.5.5, tar-stream@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
@@ -4036,6 +5380,14 @@ temp@^0.8.1:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
+tempfile@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
+  integrity sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=
+  dependencies:
+    os-tmpdir "^1.0.0"
+    uuid "^2.0.1"
+
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -4043,6 +5395,22 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
+through2-filter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
+  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=
+  dependencies:
+    through2 "~2.0.0"
+    xtend "~4.0.0"
+
+through2@^0.6.0, through2@^0.6.1:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
+  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
+  dependencies:
+    readable-stream ">=1.0.33-1 <1.1.0-0"
+    xtend ">=4.0.0 <4.1.0-0"
+
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -4051,6 +5419,14 @@ through2@^2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+through2@~2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
 "through@>=2.2.7 <3", through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -4066,6 +5442,16 @@ tilde-path@^2.0.0:
   resolved "https://registry.yarnpkg.com/tilde-path/-/tilde-path-2.0.0.tgz#ded931f9d3c522e38118a068d007e5b7523fec25"
   integrity sha512-3aDt7b/wBbxJjUTMiCW+uu7iqrB6F1DfxSL0qB4biSrP1+knIPveccs7thL34AkzPZ/0T7+oYXZDKiokMc1d6g==
 
+time-stamp@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
+
+timed-out@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
+  integrity sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=
+
 timers-browserify@^1.0.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
@@ -4073,16 +5459,28 @@ timers-browserify@^1.0.1:
   dependencies:
     process "~0.11.0"
 
+to-absolute-glob@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
+  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38=
+  dependencies:
+    extend-shallow "^2.0.1"
+
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
-to-buffer@^1.1.0:
+to-buffer@^1.1.0, to-buffer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
   integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
 
+to-executable-name@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-executable-name/-/to-executable-name-1.1.1.tgz#3f50f41bacc8d851b853c2dc78d8bbd5ae9ef250"
+  integrity sha512-r+6FRFK8VnpimozExAVA9b5WXgo9e8W04UHqfToyhY4hznxygCdp5zww8lei55hNnZuyw5xWZjhZooq4c4kieA==
+
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -4118,6 +5516,18 @@ tree-kill@^1.0.0:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
   integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
 
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
+
+trim-repeated@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
+  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@@ -4145,6 +5555,11 @@ tty-truncate@^1.0.0:
     slice-ansi "^1.0.0"
     string-width "^2.1.1"
 
+tunnel-agent@^0.4.0:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
+
 typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -4187,6 +5602,14 @@ union@~0.4.3:
   dependencies:
     qs "~2.3.3"
 
+unique-stream@^2.0.2:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
+  integrity sha1-WqADz76Uxf+GbE59ZouxxNuts2k=
+  dependencies:
+    json-stable-stringify "^1.0.0"
+    through2-filter "^2.0.0"
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -4195,6 +5618,11 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
+unzip-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
+  integrity sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=
+
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
@@ -4210,6 +5638,20 @@ url-join@^2.0.5:
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
   integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
+  dependencies:
+    prepend-http "^1.0.1"
+
+url-regex@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz#dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"
+  integrity sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=
+  dependencies:
+    ip-regex "^1.0.1"
+
 url@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -4242,6 +5684,24 @@ util@~0.10.1:
   dependencies:
     inherits "2.0.3"
 
+uuid@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+  integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
+
+vali-date@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
+  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
 vertical-meter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/vertical-meter/-/vertical-meter-1.0.0.tgz#b910bfc107294346b612618bc8bbfc3da62259cd"
@@ -4249,6 +5709,63 @@ vertical-meter@^1.0.0:
   dependencies:
     rate-map "^1.0.1"
 
+vinyl-assign@^1.0.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl-assign/-/vinyl-assign-1.2.1.tgz#4d198891b5515911d771a8cd9c5480a46a074a45"
+  integrity sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=
+  dependencies:
+    object-assign "^4.0.1"
+    readable-stream "^2.0.0"
+
+vinyl-fs@^2.2.0:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
+  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=
+  dependencies:
+    duplexify "^3.2.0"
+    glob-stream "^5.3.2"
+    graceful-fs "^4.0.0"
+    gulp-sourcemaps "1.6.0"
+    is-valid-glob "^0.3.0"
+    lazystream "^1.0.0"
+    lodash.isequal "^4.0.0"
+    merge-stream "^1.0.0"
+    mkdirp "^0.5.0"
+    object-assign "^4.0.0"
+    readable-stream "^2.0.4"
+    strip-bom "^2.0.0"
+    strip-bom-stream "^1.0.0"
+    through2 "^2.0.0"
+    through2-filter "^2.0.0"
+    vali-date "^1.0.0"
+    vinyl "^1.0.0"
+
+vinyl@^0.4.3:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
+  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
+  dependencies:
+    clone "^0.2.0"
+    clone-stats "^0.0.1"
+
+vinyl@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
+  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
+  dependencies:
+    clone "^1.0.0"
+    clone-stats "^0.0.1"
+    replace-ext "0.0.1"
+
+vinyl@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
+  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
+  dependencies:
+    clone "^1.0.0"
+    clone-stats "^0.0.1"
+    replace-ext "0.0.1"
+
 vm-browserify@~0.0.1:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -4256,6 +5773,13 @@ vm-browserify@~0.0.1:
   dependencies:
     indexof "0.0.1"
 
+ware@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ware/-/ware-1.3.0.tgz#d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"
+  integrity sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=
+  dependencies:
+    wrap-fn "^0.1.0"
+
 watchpack@^1.0.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -4307,12 +5831,19 @@ wrap-ansi@^3.0.1:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
+wrap-fn@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/wrap-fn/-/wrap-fn-0.1.5.tgz#f21b6e41016ff4a7e31720dbc63a09016bdf9845"
+  integrity sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=
+  dependencies:
+    co "3.1.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
@@ -4327,6 +5858,14 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
   integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
+yauzl@^2.2.1:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"
+
 zen-observable@^0.6.0, zen-observable@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.6.1.tgz#01dbed3bc8d02cbe9ee1112c83e04c807f647244"