Remove Promises from PureScript code (#10)

Author: spicydonuts

bower.json

@@ -28,7 +28,6 @@
     "purescript-numbers": "^6.0.0",
     "purescript-prelude": "^4.0.1",
     "purescript-profunctor-lenses": "^4.0.0",
-    "purescript-promises": "^3.0.0",
     "purescript-random": "^4.0.0",
     "purescript-react-basic": "^8.0.0 || ^9.0.0",
     "purescript-react-dnd-basic": "^6.0.0",

docs/Examples/Form.example.purs

@@ -15,13 +15,12 @@ import Data.String as String
 import Data.String.NonEmpty (length, NonEmptyString, toString)
 import Data.Symbol (SProxy(..))
 import Effect (Effect)
-import Effect.Aff (Milliseconds(..), delay, error, throwError)
+import Effect.Aff (Aff, Milliseconds(..), delay, error, throwError)
 import Effect.Class (liftEffect)
-import Effect.Promise (Promise)
-import Effect.Promise.Unsafe (undefer)
 import Effect.Random (randomRange)
 import Lumi.Components.Button as Button
 import Lumi.Components.Column (column, column_)
+import Lumi.Components.Example (example)
 import Lumi.Components.Form (FormBuilder, Validated)
 import Lumi.Components.Form as F
 import Lumi.Components.Form.Defaults (formDefaults)
@@ -33,8 +32,6 @@ import Lumi.Components.Size (Size(..))
 import Lumi.Components.Text (h1_)
 import Lumi.Components.Upload (FileId(..))
 import Lumi.Components.Upload as Upload
-import Lumi.Components.Utility.AffToPromise (affToPromise)
-import Lumi.Components.Example (example)
 import React.Basic (Component, JSX, createComponent, make)
 import React.Basic.DOM (css)
 import React.Basic.DOM as R
@@ -197,7 +194,7 @@ docs = unit # make component { initialState, render }
                   }
           ]
 
-    loadColor simulatePauses c = undefer $ affToPromise do
+    loadColor simulatePauses c = do
       when simulatePauses do
         delay (Milliseconds 500.0)
       case String.toLower c of
@@ -206,7 +203,7 @@ docs = unit # make component { initialState, render }
         "blue" -> pure { label: "Blue", value: "blue" }
         _ -> throwError (error "No color")
 
-    loadColors simulatePauses search = undefer $ affToPromise do
+    loadColors simulatePauses search = do
       when simulatePauses do
         delay (Milliseconds 1000.0)
       pure
@@ -268,8 +265,8 @@ type ValidatedUser =
 userComponent
   :: { value :: User
      , onChange :: Maybe ValidatedUser -> User -> Effect Unit
-     , loadColor :: String -> Promise { label :: String, value :: String }
-     , loadColors :: String -> Promise (Array { label :: String, value :: String })
+     , loadColor :: String -> Aff { label :: String, value :: String }
+     , loadColors :: String -> Aff (Array { label :: String, value :: String })
      , inlineTable :: Boolean
      , forceTopLabels :: Boolean
      , readonly :: Boolean

src/Lumi/Components/Form.purs

@@ -62,8 +62,6 @@ import Data.Traversable (intercalate, traverse, traverse_)
 import Effect (Effect)
 import Effect.Aff (Aff)
 import Effect.Class (liftEffect)
-import Effect.Promise (Promise)
-import Effect.Promise.Unsafe (undefer)
 import JSS (JSS, jss)
 import Lumi.Components.Color (colors)
 import Lumi.Components.Column (column)
@@ -84,7 +82,6 @@ import Lumi.Components.Select as Select
 import Lumi.Components.Text (body, body_, subsectionHeader, text)
 import Lumi.Components.Textarea as Textarea
 import Lumi.Components.Upload as Upload
-import Lumi.Components.Utility.AffToPromise (promiseToAff)
 import Prim.Row (class Nub, class Union)
 import React.Basic (JSX, createComponent, element, empty, fragment, keyed, makeStateless)
 import React.Basic.Components.Async (async, asyncWithLoader)
@@ -457,7 +454,7 @@ multiSelect encode opts = formBuilder_ \{ readonly } selected onChange ->
 -- |    . (Select.SelectOption additionalData -> JSX)
 -- |   -> FormBuilder
 -- |      { readonly :: Boolean
--- |      , foo :: String -> Promise (Either String
+-- |      , foo :: String -> Aff (Either String
 -- |                 (Array (Select.SelectOption additionalData)))
 -- |      | props
 -- |      }
@@ -468,7 +465,7 @@ asyncSelect
    . IsSymbol l
   => Cons
        l
-       (String -> Promise (Array a))
+       (String -> Aff (Array a))
        rest
        (readonly :: Boolean | props)
   => SProxy l
@@ -487,7 +484,7 @@ asyncSelect l toSelectOption optionRenderer =
 
       else Select.asyncSingleSelect
         { value
-        , loadOptions: \search -> promiseToAff (undefer (get l props search))
+        , loadOptions: get l props
         , onChange: onChange
         , className: ""
         , style: css {}
@@ -510,12 +507,12 @@ asyncSelectByKey
   => IsSymbol l
   => Cons
        k
-       (id -> Promise a)
+       (id -> Aff a)
        rest1
        (readonly :: Boolean | props)
   => Cons
        l
-       (String -> Promise (Array a))
+       (String -> Aff (Array a))
        rest2
        (readonly :: Boolean | props)
   => SProxy k
@@ -528,7 +525,7 @@ asyncSelectByKey
 asyncSelectByKey k l fromId toId toSelectOption optionRenderer =
   formBuilder_ \props@{ readonly } value onChange ->
     FetchCache.single
-      { getData: \key -> promiseToAff (undefer (get k props (toId key)))
+      { getData: \key -> get k props (toId key)
       , id: map fromId value
       , render: \data_ ->
           if readonly
@@ -546,7 +543,7 @@ asyncSelectByKey k l fromId toId toSelectOption optionRenderer =
             else
               Select.asyncSingleSelect
                 { value: data_
-                , loadOptions: \search -> promiseToAff (undefer (get l props search))
+                , loadOptions: get l props
                 , onChange: onChange <<< map (toId <<< _.value <<< toSelectOption)
                 , className: ""
                 , style: css {}