Update dependencies (#2)

* Update dependencies

* Add ElemName newtype, derive more Namespace instances

* Fixed test

* Two more instances

* Generic ¯\_(ツ)_/¯ & unicode arrows

Author: garyb

bower.json

@@ -22,19 +22,19 @@
     "output"
   ],
   "dependencies": {
-    "purescript-prelude": "^1.0.1",
-    "purescript-eff": "^1.0.0",
-    "purescript-tuples": "^1.0.0",
-    "purescript-dom": "^2.0.1",
-    "purescript-maps": "^1.1.0",
-    "purescript-maybe": "^1.0.0",
-    "purescript-unsafe-coerce": "^1.0.0",
-    "purescript-bifunctors": "^1.0.0"
+    "purescript-prelude": "^2.1.0",
+    "purescript-eff": "^2.0.0",
+    "purescript-tuples": "^3.0.0",
+    "purescript-dom": "^3.3.0",
+    "purescript-maps": "^2.0.1",
+    "purescript-maybe": "^2.0.1",
+    "purescript-unsafe-coerce": "^2.0.0",
+    "purescript-bifunctors": "^2.0.0"
   },
   "devDependencies": {
-    "purescript-psci-support": "^1.0.0",
-    "purescript-js-timers": "^1.0.0",
-    "purescript-exists": "^1.0.0",
-    "purescript-refs": "^1.0.0"
+    "purescript-psci-support": "^2.0.0",
+    "purescript-js-timers": "^2.0.0",
+    "purescript-exists": "^2.0.0",
+    "purescript-refs": "^2.0.0"
   }
 }

package.json

@@ -6,9 +6,9 @@
     "build": "pulp build --censor-lib --strict"
   },
   "devDependencies": {
-    "pulp": "^9.0.1",
-    "purescript": "^0.9.2",
-    "purescript-psa": "^0.3.9",
+    "pulp": "^10.0.0",
+    "purescript": "^0.10.2",
+    "purescript-psa": "^0.4.0",
     "rimraf": "^2.5.4"
   }
 }

src/Halogen/VDom.purs

@@ -6,4 +6,4 @@ module Halogen.VDom
 
 import Halogen.VDom.DOM (VDomEff, VDomMachine, VDomStep, VDomSpec(..), buildVDom) as DOM
 import Halogen.VDom.Machine (Machine, Step(..), extract, step, halt) as Machine
-import Halogen.VDom.Types (VDom(..), Graft, runGraft, ElemSpec(..), Namespace(..), unNamespace) as Types
+import Halogen.VDom.Types (VDom(..), Graft, runGraft, ElemSpec(..), ElemName(..), Namespace(..)) as Types

src/Halogen/VDom/DOM.purs

@@ -23,7 +23,7 @@ import DOM.Node.Types (Element, Node, Document, elementToNode) as DOM
 
 import Halogen.VDom.Machine (Step(..), Machine)
 import Halogen.VDom.Machine as Machine
-import Halogen.VDom.Types (VDom(..), ElemSpec(..), Namespace(..), runGraft)
+import Halogen.VDom.Types (VDom(..), ElemSpec(..), ElemName, Namespace(..), runGraft)
 import Halogen.VDom.Util (forE, forInE, whenE, diffWithIxE, diffWithKeyAndIxE, strMapWithIxE, refEq)
 
 data Quaple a b c d = Quaple a b c d
@@ -212,7 +212,7 @@ buildWidget (VDomSpec spec) = render
 
 createElem
   ∷ ∀ eff
-  . Fn.Fn3 (Maybe Namespace) String DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
+  . Fn.Fn3 (Maybe Namespace) ElemName DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
 createElem = Fn.mkFn3 \ns name doc →
   case ns of
     Nothing → Fn.runFn2 createElement name doc
@@ -240,11 +240,11 @@ foreign import setTextContent
 
 foreign import createElement
   ∷ ∀ eff
-  . Fn.Fn2 String DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
+  . Fn.Fn2 ElemName DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
 
 foreign import createElementNS
   ∷ ∀ eff
-  . Fn.Fn3 Namespace String DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
+  . Fn.Fn3 Namespace ElemName DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
 
 foreign import replaceChild
   ∷ ∀ eff

src/Halogen/VDom/Types.purs

@@ -6,14 +6,16 @@ module Halogen.VDom.Types
   , unGraft
   , runGraft
   , ElemSpec(..)
+  , ElemName(..)
   , Namespace(..)
-  , unNamespace
   ) where
 
 import Prelude
 import Data.Bifunctor (class Bifunctor, bimap)
+import Data.Generic (class Generic)
 import Data.Maybe (Maybe)
-import Data.Tuple(Tuple)
+import Data.Newtype (class Newtype)
+import Data.Tuple (Tuple)
 import Unsafe.Coerce (unsafeCoerce)
 
 data VDom a w
@@ -72,14 +74,25 @@ runGraft =
     in
       go v
 
-data ElemSpec a = ElemSpec (Maybe Namespace) String a
+data ElemSpec a = ElemSpec (Maybe Namespace) ElemName a
+
+derive instance eqElemSpec ∷ Eq a ⇒ Eq (ElemSpec a)
+derive instance ordElemSpec ∷ Ord a ⇒ Ord (ElemSpec a)
+derive instance genericElemSpec ∷ Generic a ⇒ Generic (ElemSpec a)
 
 instance functorElemSpec ∷ Functor ElemSpec where
   map f (ElemSpec ns name a) = ElemSpec ns name (f a)
 
-newtype Namespace = Namespace String
+newtype ElemName = ElemName String
 
-derive instance eqNamespace ∷ Eq Namespace
+derive instance newtypeElemName ∷ Newtype ElemName _
+derive newtype instance eqElemName ∷ Eq ElemName
+derive newtype instance ordElemName ∷ Ord ElemName
+derive instance genericElemName ∷ Generic ElemName
+
+newtype Namespace = Namespace String
 
-unNamespace ∷ Namespace → String
-unNamespace (Namespace s) = s
+derive instance newtypeNamespace ∷ Newtype Namespace _
+derive newtype instance eqNamespace ∷ Eq Namespace
+derive newtype instance ordNamespace ∷ Ord Namespace
+derive instance genericNamespace ∷ Generic Namespace

test/Main.purs

@@ -47,17 +47,17 @@ type LastSample =
 type DBQuery =
   { elapsedClassName ∷ String
   , formatElapsed ∷ String
-  , query ∷ String 
+  , query ∷ String
   }
 
 initialState ∷ State
 initialState = []
 
 elem ∷ ∀ a w. String → a → Array (V.VDom a w) → V.VDom a w
-elem n a = V.Elem (V.ElemSpec Nothing n a)
+elem n a = V.Elem (V.ElemSpec Nothing (V.ElemName n) a)
 
 keyed ∷ ∀ a w. String → a → Array (Tuple String (V.VDom a w)) → V.VDom a w
-keyed n a = V.Keyed (V.ElemSpec Nothing n a)
+keyed n a = V.Keyed (V.ElemSpec Nothing (V.ElemName n) a)
 
 text ∷ ∀ a w. String → V.VDom a w
 text = V.Text
@@ -96,7 +96,7 @@ renderData st =
       [ "class" := "Query" <> q.elapsedClassName ]
       [ text q.formatElapsed
       , elem "div"
-          [ "class" := "popover left" ] 
+          [ "class" := "popover left" ]
           [ elem "div"
               [ "class" := "popover-content" ]
               [ text q.query ]