Move to spago; update bower dependencies (#20)

Author: easafe

.gitignore

@@ -17,4 +17,6 @@ _site/
 
 .jekyll-metadata
 
-scratchpad.*
+scratchpad.*
+
+.spago

bower.json

@@ -18,7 +18,7 @@
     "purescript-aff": "^5.1.0",
     "purescript-signal": "^10.1.0",
     "purescript-foreign-object": "^2.0.1",
-    "purescript-argonaut-generic": "^5.0.0"
+    "purescript-argonaut-generic": "^6.0.0"
   },
   "devDependencies": {
     "purescript-psci-support": "^4.0.0",

packages.dhall

@@ -0,0 +1,128 @@
+{-
+Welcome to your new Dhall package-set!
+
+Below are instructions for how to edit this file for most use
+cases, so that you don't need to know Dhall to use it.
+
+## Warning: Don't Move This Top-Level Comment!
+
+Due to how `dhall format` currently works, this comment's
+instructions cannot appear near corresponding sections below
+because `dhall format` will delete the comment. However,
+it will not delete a top-level comment like this one.
+
+## Use Cases
+
+Most will want to do one or both of these options:
+1. Override/Patch a package's dependency
+2. Add a package not already in the default package set
+
+This file will continue to work whether you use one or both options.
+Instructions for each option are explained below.
+
+### Overriding/Patching a package
+
+Purpose:
+- Change a package's dependency to a newer/older release than the
+    default package set's release
+- Use your own modified version of some dependency that may
+    include new API, changed API, removed API by
+    using your custom git repo of the library rather than
+    the package set's repo
+
+Syntax:
+Replace the overrides' "{=}" (an empty record) with the following idea
+The "//" or "⫽" means "merge these two records and
+  when they have the same value, use the one on the right:"
+-------------------------------
+let overrides =
+  { packageName =
+      upstream.packageName // { updateEntity1 = "new value", updateEntity2 = "new value" }
+  , packageName =
+      upstream.packageName // { version = "v4.0.0" }
+  , packageName =
+      upstream.packageName // { repo = "https://www.example.com/path/to/new/repo.git" }
+  }
+-------------------------------
+
+Example:
+-------------------------------
+let overrides =
+  { halogen =
+      upstream.halogen // { version = "master" }
+  , halogen-vdom =
+      upstream.halogen-vdom // { version = "v4.0.0" }
+  }
+-------------------------------
+
+### Additions
+
+Purpose:
+- Add packages that aren't already included in the default package set
+
+Syntax:
+Replace the additions' "{=}" (an empty record) with the following idea:
+-------------------------------
+let additions =
+  { package-name =
+       { dependencies =
+           [ "dependency1"
+           , "dependency2"
+           ]
+       , repo =
+           "https://example.com/path/to/git/repo.git"
+       , version =
+           "tag ('v4.0.0') or branch ('master')"
+       }
+  , package-name =
+       { dependencies =
+           [ "dependency1"
+           , "dependency2"
+           ]
+       , repo =
+           "https://example.com/path/to/git/repo.git"
+       , version =
+           "tag ('v4.0.0') or branch ('master')"
+       }
+  , etc.
+  }
+-------------------------------
+
+Example:
+-------------------------------
+let additions =
+  { benchotron =
+      { dependencies =
+          [ "arrays"
+          , "exists"
+          , "profunctor"
+          , "strings"
+          , "quickcheck"
+          , "lcg"
+          , "transformers"
+          , "foldable-traversable"
+          , "exceptions"
+          , "node-fs"
+          , "node-buffer"
+          , "node-readline"
+          , "datetime"
+          , "now"
+          ]
+      , repo =
+          "https://github.com/hdgarrood/purescript-benchotron.git"
+      , version =
+          "v7.0.0"
+      }
+  }
+-------------------------------
+-}
+
+
+let upstream =
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200822/packages.dhall sha256:b4f151f1af4c5cb6bf5437489f4231fbdd92792deaf32971e6bcb0047b3dd1f8
+
+let overrides = {=}
+
+let additions = {=}
+
+in  upstream // overrides // additions

spago.dhall

@@ -0,0 +1,28 @@
+{-
+Welcome to a Spago project!
+You can edit this file as you like.
+-}
+{ name = "flame"
+, dependencies =
+  [ "aff"
+  , "argonaut-codecs"
+  , "argonaut-generic"
+  , "console"
+  , "debug"
+  , "effect"
+  , "foreign-object"
+  , "integers"
+  , "node-http"
+  , "nullable"
+  , "prelude"
+  , "psci-support"
+  , "random"
+  , "record"
+  , "signal"
+  , "test-unit"
+  , "web-events"
+  , "web-html"
+  ]
+, packages = ./packages.dhall
+, sources = [ "src/**/*.purs", "test/**/*.purs" ]
+}

src/Flame/Application/PreMount.purs

@@ -1,8 +1,5 @@
 module Flame.Application.PreMount where
 
-import Flame.Types (Html(..), PreApplication)
-import Prelude (bind, discard, otherwise, pure, ($), (<<<), (<>), (==))
-
 import Control.Monad.Except as CME
 import Data.Argonaut.Core as DAC
 import Data.Argonaut.Decode.Generic.Rep (class DecodeRep)
@@ -13,6 +10,7 @@ import Data.Argonaut.Parser as DAP
 import Data.Array ((:))
 import Data.Array as DA
 import Data.Either (Either(..))
+import Data.Either as DE
 import Data.Generic.Rep (class Generic)
 import Data.Maybe (Maybe(..))
 import Data.Maybe as DM
@@ -25,7 +23,9 @@ import Flame.Application.DOM as FAD
 import Flame.HTML.Attribute as HA
 import Flame.HTML.Element as HE
 import Flame.Renderer.String as FRS
+import Flame.Types (Html(..), PreApplication)
 import Partial.Unsafe (unsafePartial)
+import Prelude (bind, discard, otherwise, pure, show, ($), (<<<), (<>), (==))
 import Web.DOM.ParentNode (QuerySelector(..))
 
 tagSerializedState :: String
@@ -58,7 +58,7 @@ serializedState selector = do
                 Nothing -> EE.throw $ "Error resuming application mount: serialized state not found!"
         where   decoding contents = do
                         json <- DAP.jsonParser contents
-                        DADEGR.genericDecodeJson json
+                        DE.either (Left <<< show) Right $ DADEGR.genericDecodeJson json
 
 preMount :: forall model m message. Generic model m => EncodeRep m => QuerySelector -> PreApplication model message -> Effect String
 preMount (QuerySelector selector) application = do

src/Flame/Types.purs

@@ -61,7 +61,6 @@ data Html message =
 
 derive instance elementFunctor :: Functor Html
 
-
 instance showHtml :: Show (Html message) where
         show (Node tag nodeData children) = "(Node " <> tag <> " " <> show (isNonEventData nodeData) <> " " <> show children <> ")"
         show (Text t) = "(Text " <> t <> ")"
@@ -72,7 +71,6 @@ instance eqHtml :: Eq (Html message) where
         eq (Text t) (Text t2) = t == t2
         eq _ _ = false
 
-
 isNonEventData :: forall t. Array (NodeData t) -> Array (NodeData t)
 isNonEventData = DA.filter case _ of
                         Attribute _ _ -> true
@@ -99,6 +97,5 @@ instance eqNodeData :: Eq (NodeData message) where
         eq (Property name val) (Property name2 val2) = name == name2 && val == val2
         eq _ _ = false
 
-
 -- | Infix tuple constructor
 infixr 6 Tuple as :>