feat: update to purescript v0.13.6, to halogen-vdom v6.1.2, replace deprecated package maps with ordered-collections, remove bower, install spago

Author: srghma

bower.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "scripts": {
-    "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "pulp build -- --censor-lib --strict"
+    "clean": "rimraf output && rimraf .spago",
+    "build": "spago build"
   },
   "devDependencies": {
-    "pulp": "^11.0.0",
-    "purescript-psa": "^0.5.1",
-    "purescript": "^0.11.4",
-    "rimraf": "^2.6.1"
+    "spago": "^0.14.0",
+    "purescript-psa": "^0.7.3",
+    "purescript": "^0.13.6",
+    "rimraf": "^3.0.2"
   }
 }

package.json

@@ -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.6-20200309/packages.dhall sha256:9221987b4e7ea99ccd0efbe056f7bebc872cd92e0058efe5baa181d73359e7b3
+
+let overrides = {=}
+
+let additions = {=}
+
+in  upstream // overrides // additions

packages.dhall

@@ -0,0 +1,9 @@
+{-
+Welcome to a Spago project!
+You can edit this file as you like.
+-}
+{ name = "halogen-vdom-string-renderer"
+, dependencies = [ "console", "effect", "psci-support", "halogen-vdom", "ordered-collections", "foreign" ]
+, packages = ./packages.dhall
+, sources = [ "src/**/*.purs", "test/**/*.purs" ]
+}

spago.dhall

@@ -4,11 +4,10 @@ import Prelude
 import Halogen.VDom (VDom, ElemName(..))
 import Halogen.VDom.DOM.Prop (Prop(..), PropValue)
 import Data.Array as A
-import Data.Foreign (toForeign, typeOf)
+import Foreign (unsafeToForeign, typeOf)
 import Data.Maybe (Maybe(..))
 import Data.String as S
-import Data.StrMap as SM
-import Data.Tuple (Tuple(..))
+import Data.Set as Set
 import Halogen.VDom.StringRenderer as VSR
 import Halogen.VDom.StringRenderer.Util (escape)
 import Unsafe.Coerce (unsafeCoerce)
@@ -18,7 +17,7 @@ render renderWidget = VSR.render getTagType renderProps renderWidget
 
 getTagType ∷ ElemName → VSR.TagType
 getTagType (ElemName en)
-  | SM.member en voidElements = VSR.SelfClosingTag
+  | Set.member en voidElements = VSR.SelfClosingTag
   | otherwise = VSR.NormalTag
 
 renderProps ∷ ∀ i. Array (Prop i) → String
@@ -41,19 +40,17 @@ propNameToAttrName = case _ of
   p → p
 
 renderProperty ∷ String → PropValue → Maybe String
-renderProperty name prop = case typeOf (toForeign prop) of
+renderProperty name prop = case typeOf (unsafeToForeign prop) of
   "string"  → renderAttr name' $ (unsafeCoerce ∷ PropValue → String) prop
   "number"  → renderAttr name' $ show ((unsafeCoerce ∷ PropValue → String) prop)
   "boolean" → Just $ escape name'
   _ → Nothing
   where
   name' = propNameToAttrName name
 
-voidElements :: SM.StrMap Unit
+voidElements :: Set.Set String
 voidElements =
-  SM.fromFoldable
-    $ map (flip Tuple unit)
-    $ names
+  Set.fromFoldable names
   where
   names =
     [ "area"

src/Halogen/VDom/DOM/StringRenderer.purs

@@ -6,11 +6,11 @@ module Halogen.VDom.StringRenderer
 import Prelude
 
 import Data.Array as A
-import Data.Maybe (maybe)
+import Data.Maybe (Maybe, maybe)
 import Data.String as S
 import Data.Tuple (snd)
 
-import Halogen.VDom (VDom(..), ElemSpec(..), ElemName(..), Namespace(..), runGraft)
+import Halogen.VDom (VDom(..), ElemName(..), Namespace(..), runGraft)
 import Halogen.VDom.StringRenderer.Util (escape)
 
 -- | Type used to determine whether an element can be rendered as self-closing
@@ -25,29 +25,29 @@ derive instance ordTagType ∷ Ord TagType
 -- | Renders a `VDom` tree to a string using the specified tag type scheme,
 -- | attribute renderer, and widget renderer.
 render
-  ∷ ∀ a w
+  ∷ ∀ attrs widget
   . (ElemName → TagType)
-  → (a → String)
-  → (w → String)
-  → VDom a w
+  → (attrs → String)
+  → (widget → String)
+  → VDom attrs widget
   → String
 render getTagType renderAttrs renderWidget = go
   where
-  go ∷ VDom a w → String
+  go ∷ VDom attrs widget → String
   go = case _ of
     Text s → escape s
-    Elem elem children → renderElement elem children
-    Keyed elem kchildren → renderElement elem (map snd kchildren)
-    Widget w → renderWidget w
+    Elem namespace elementName attrs children → renderElement namespace elementName attrs children
+    Keyed namespace elementName attrs kchildren → renderElement namespace elementName attrs (map snd kchildren)
+    Widget widget → renderWidget widget
     Grafted g → go (runGraft g)
 
-  renderElement ∷ ElemSpec a → Array (VDom a w) → String
-  renderElement (ElemSpec mns en@(ElemName name) attrs) children =
+  renderElement ∷ (Maybe Namespace) -> ElemName -> attrs → Array (VDom attrs widget) → String
+  renderElement maybeNamespace elemName@(ElemName name) attrs children =
     let
       as = renderAttrs attrs
-      as' = maybe as (\(Namespace ns) -> "xmlns=\"" <> escape ns <> "\"" <> if S.null as then "" else " " <> as) mns
+      as' = maybe as (\(Namespace ns) -> "xmlns=\"" <> escape ns <> "\"" <> if S.null as then "" else " " <> as) maybeNamespace
     in
       "<" <> name <> (if S.null as then "" else " ") <> as <>
         if A.null children
-        then if getTagType en == SelfClosingTag then "/>" else "></" <> name <> ">"
+        then if getTagType elemName == SelfClosingTag then "/>" else "></" <> name <> ">"
         else ">" <> S.joinWith "" (map go children) <> "</" <> name <> ">"

src/Halogen/VDom/StringRenderer.purs

@@ -0,0 +1,11 @@
+module Test.Main where
+
+import Prelude
+
+import Effect (Effect)
+import Effect.Class.Console (log)
+
+main :: Effect Unit
+main = do
+  log "🍝"
+  log "You should add some tests."