Update for PureScript 0.14

Author: paluh

packages.dhall

@@ -1,28 +1,20 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20210118/packages.dhall sha256:a59c5c93a68d5d066f3815a89f398bcf00e130a51cb185b2da29b20e2d8ae115
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.4-20211030/packages.dhall sha256:5cd7c5696feea3d3f84505d311348b9e90a76c4ce3684930a0ff29606d2d816c
 
 let mkPackage =
       https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.0-20190626/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
 
-let overrides = {=}
-
-
 let homogeneous = mkPackage
   [ "assert", "console", "effect", "foreign-object", "psci-support"
   , "record-extra", "typelevel-eval", "variant"
   ]
   "https://github.com/paluh/purescript-homogeneous.git"
-  "master"
+  "v0.3.0"
 
-let postgresql-client = mkPackage
-  [ "aff", "arrays", "bifunctors", "bytestrings", "datetime", "decimals", "effect"
-  , "either", "exceptions", "foldable-traversable", "foreign", "foreign-generic"
-  , "foreign-object", "js-date", "lists", "maybe", "newtype", "nullable", "prelude"
-  , "string-parsers", "transformers", "tuples"
-  ]
-  "https://github.com/rightfold/purescript-postgresql-client.git"
-  -- "v3.1.0"
-  "pool-query"
+let js-uri = mkPackage
+  [ "assert", "effect", "functions", "maybe", "prelude" ]
+  "https://github.com/srghma/purescript-js-uri.git"
+  "d25d83390ba9cf948f46695b55a5511895b0068c"
 
 let polyform = mkPackage
   [ "newtype", "ordered-collections", "variant", "profunctor", "invariant", "foreign-object"
@@ -44,34 +36,49 @@ let polyform-batteries-env = mkPackage
 let polyform-batteries-urlencoded = mkPackage
   [ "polyform-batteries-core", "argonaut", "prelude", "affjax", "numbers" ]
   "https://github.com/purescript-polyform/batteries-urlencoded.git"
-  "master"
+  "v0.1.0"
+
+let postgresql-client = mkPackage
+  [ "aff", "arrays", "bifunctors", "bytestrings", "datetime", "decimals", "effect"
+  , "either", "exceptions", "foldable-traversable", "foreign", "foreign-generic"
+  , "foreign-object", "js-date", "lists", "maybe", "newtype", "nullable", "prelude"
+  , "string-parsers", "transformers", "tuples"
+  ]
+  "https://github.com/rightfold/purescript-postgresql-client.git"
+  "v4.0.0-pre"
+
 
 let prettyprinter = mkPackage
   [ "prelude", "unfoldable", "random", "ansi", "console" ]
   "https://github.com/Kamirus/purescript-prettyprinter.git"
   "master"
 
-let routing-duplex-variant = mkPackage
-  [ "routing-duplex" ]
-  "https://github.com/paluh/purescript-routing-duplex-variant.git"
-  "master"
-
 let resourcet = mkPackage
   [ "aff", "ordered-collections", "refs", "transformers" ]
   "https://github.com/robertdp/purescript-resourcet.git"
   "2183bac0f1a528a5d6cdddb4fa223c4a8b9bb604"
 
+let routing-duplex-variant = mkPackage
+  [ "routing-duplex" ]
+  "https://github.com/paluh/purescript-routing-duplex-variant.git"
+  "v0.1.0"
+
+let run-streaming = mkPackage
+  [ "prelude", "run" ]
+  "https://github.com/paluh/purescript-run-streaming.git"
+  "master"
+
 let selda = mkPackage
   [ "console", "exists", "heterogeneous", "lists", "node-sqlite3", "postgresql-client"
   , "prelude", "simple-json", "strings", "test-unit", "transformers", "variant", "prettyprinter"
   ]
-  "https://github.com/Kamirus/purescript-selda.git"
-  "scope-as-backend-with-new-pg-client"
+  "https://github.com/paluh/purescript-selda.git"
+  "postgresql-client-v4.0.0"
 
 let typelevel-eval = mkPackage
   [ "prelude", "typelevel-prelude", "tuples", "unsafe-coerce", "leibniz" ]
   "https://github.com/natefaubion/purescript-typelevel-eval.git"
-  "master"
+  "polykinds"
 
 --   { dependencies =
 --     [ "effect"
@@ -86,24 +93,55 @@ let typelevel-eval = mkPackage
 --       "master"
 --   }
 
-let additions =
-  { homogeneous
-  , polyform = ../polyform/spago.dhall as Location
-  , polyform-batteries-core = ../batteries-core/spago.dhall as Location
-  , polyform-batteries-env = ../batteries-env/spago.dhall as Location
-  , polyform-batteries-json = ../batteries-json/spago.dhall as Location
-  , polyform-batteries-urlencoded = ../batteries-urlencoded/spago.dhall as Location
-  , postgresql-client = ../postgresql-client/spago.dhall as Location
-  , prettyprinter
-  , resourcet
-  , routing-duplex-variant
-  , typelevel-eval
-  , selda = ../selda/spago.dhall as Location
-  }
-
-let overrides =
-  { httpure = upstream.httpure // { version = "b3eb977096b5ea177fdffd8fc9c61bcbbcfab49d" }
-  , media-types = upstream.media-types // { version = "4c685071074065506403197b7a5f22eb661ff17c" }
-  }
-
-in  upstream // overrides // additions
+in  upstream
+  with
+    httpure = upstream.httpure // { version = "6ce52417f79c95c9fac413189825f35472c8f937" }
+  with
+    homogeneous = homogeneous
+  with
+    js-unsafe-stringify = ../purescript-js-unsafe-stringify/spago.dhall as Location
+  with
+    js-uri = js-uri
+  with
+    logging-journald = ../purescript-logging-journald/spago.dhall as Location
+  with
+    media-types = upstream.media-types // { version = "4c685071074065506403197b7a5f22eb661ff17c" }
+  with
+    polyform = ../polyform/spago.dhall as Location
+  with
+    polyform-batteries-core = ../batteries-core/spago.dhall as Location
+  with
+    polyform-batteries-env = ../batteries-env/spago.dhall as Location
+  with
+    polyform-batteries-json = ../batteries-json/spago.dhall as Location
+  with
+    polyform-batteries-urlencoded = ../batteries-urlencoded/spago.dhall as Location
+  with
+    postgresql-client = ../postgresql-client/spago.dhall as Location
+  with
+    prettyprinter = prettyprinter
+  with
+    resourcet = resourcet
+  with
+    routing-duplex-variant = routing-duplex-variant
+  with
+    run-streaming = run-streaming
+  with
+    typelevel-eval = typelevel-eval
+  with
+    selda = ../selda/spago.dhall as Location
+  with
+    smolder = mkPackage
+    [ "bifunctors"
+    , "catenable-lists"
+    , "free"
+    , "js-uri"
+    , "ordered-collections"
+    , "prelude"
+    , "strings"
+    , "test-unit"
+    , "transformers"
+    , "tuples"
+    ]
+    "https://github.com/nsaunders/purescript-smolder.git"
+    "ps-0.14"

spago.dhall

@@ -4,25 +4,53 @@ You can edit this file as you like.
 -}
 { name = "audiocarrier"
 , dependencies =
-  [ "b64"
+  [ "aff"
+  , "argonaut"
+  , "arrays"
+  , "b64"
+  , "bifunctors"
   , "console"
-  , "crypto"
+  , "control"
+  , "datetime"
+  , "dotenv"
   , "effect"
-  , "homogeneous"
+  , "either"
+  , "exceptions"
+  , "foldable-traversable"
+  , "foreign"
+  , "foreign-object"
   , "httpure"
-  , "logging-journald"
+  , "identity"
+  , "invariant"
+  , "js-date"
+  , "js-unsafe-stringify"
+  , "js-uri"
+  , "lazy"
+  , "lists"
+  , "maybe"
   , "media-types"
+  , "newtype"
+  , "node-buffer"
+  , "node-fs-aff"
+  , "node-http"
+  , "node-process"
+  , "node-streams"
   , "optparse"
+  , "ordered-collections"
+  , "partial"
   , "polyform"
   , "polyform-batteries-core"
   , "polyform-batteries-env"
   , "polyform-batteries-json"
   , "polyform-batteries-urlencoded"
   , "postgresql-client"
+  , "prelude"
+  , "profunctor"
   , "profunctor-lenses"
   , "psci-support"
+  , "random"
   , "record"
-  , "record-extra"
+  , "refs"
   , "resourcet"
   , "routing-duplex"
   , "routing-duplex-variant"
@@ -33,10 +61,14 @@ You can edit this file as you like.
   , "smolder"
   , "spec"
   , "strings"
-  , "string-parsers"
-  , "typelevel-eval"
+  , "transformers"
+  , "tuples"
+  , "typelevel-prelude"
   , "undefined-is-not-a-problem"
+  , "unsafe-coerce"
   , "uuid"
+  , "validation"
+  , "variant"
   ]
 , packages = ./packages.dhall
 , sources = [ "src/**/*.purs", "test/**/*.purs" ]

src/WebRow/Applets/Auth.purs

@@ -11,10 +11,11 @@ import Data.Maybe (Maybe(..))
 import Data.Tuple (Tuple(..))
 import Data.Variant (Variant, inj, on)
 import HTTPure as HTTPure
+import Polyform.Batteries.UrlEncoded.Validators (MissingValue)
 import Run (Run)
 import Type.Row (type (+))
-import WebRow.Applets.Auth.Effects (Auth, User)
 import WebRow.Applets.Auth.Effects (Auth, User) as Exports
+import WebRow.Applets.Auth.Effects (Auth, User, AUTH)
 import WebRow.Applets.Auth.Forms (AuthPayload, loginForm)
 import WebRow.Applets.Auth.Messages (Messages) as Exports
 import WebRow.Applets.Auth.Responses (LoginResponse(..), Response(..), ResponseRow)
@@ -25,6 +26,7 @@ import WebRow.Applets.Auth.Routes (localDuplex, routeBuilder, Route(..), RouteRo
 import WebRow.Applets.Auth.Types (_auth, namespace)
 import WebRow.Forms.Payload (fromBody)
 import WebRow.Forms.Uni (default, validate) as Forms.Uni
+import WebRow.Forms.Validators (InvalidEmailFormat)
 import WebRow.HTTP (methodNotAllowed', method, redirect)
 import WebRow.Routing (fromRelativeUrl)
 import WebRow.Routing (printRoute) as Routing
@@ -34,14 +36,15 @@ import WebRow.Types (WebRow)
 
 type AuthRow messages routes session user eff
   = ( WebRow
-        ( authFailed ∷ AuthPayload
-        , invalidEmailFormat ∷ String
-        , missingValue ∷ Unit
-        | messages
+        ( MissingValue
+        + InvalidEmailFormat
+        + ( authFailed ∷ AuthPayload
+          | messages
+          )
         )
         { user ∷ Maybe (User user) | session }
         (RouteRow + routes)
-        + Auth user
+        + AUTH user
         + eff
     )
 

src/WebRow/Applets/Auth/Effects.purs

@@ -1,22 +1,21 @@
 module WebRow.Applets.Auth.Effects where
 
 import Prelude
+
 import Data.Maybe (Maybe)
-import Run (FProxy, Run)
+import Run (Run)
 import Run (lift) as Run
+import Type.Row (type (+))
 import WebRow.Applets.Auth.Types (Password, _auth)
 import WebRow.Mailer (Email)
 
-data AuthF user a
+data Auth user a
   = Authenticate Email Password (Maybe (User user) → a)
 
-derive instance functorAuthF ∷ Functor (AuthF user)
-
-type AUTH user
-  = FProxy (AuthF user)
+derive instance functorAuth ∷ Functor (Auth user)
 
-type Auth user r
-  = ( auth ∷ AUTH user | r )
+type AUTH user r
+  = ( auth ∷ Auth user | r )
 
 type User user
   = { email ∷ Email | user }
@@ -25,16 +24,16 @@ authenticate ∷
   ∀ eff user.
   Email →
   Password →
-  Run ( auth ∷ AUTH user | eff ) (Maybe (User user))
+  Run ( AUTH user + eff ) (Maybe (User user))
 authenticate email password = Run.lift _auth (Authenticate email password identity)
 
--- data AuthF user a
+-- data Auth user a
 --   = CurrentUser (Maybe (User user) → a)
 --   | CheckPassword Email Password (Boolean → a)
 -- 
--- derive instance functorAuthF ∷ Functor (AuthF user)
+-- derive instance functorAuth ∷ Functor (Auth user)
 -- 
--- type AUTH user = FProxy (AuthF user)
+-- type AUTH user = Proxy (Auth user)
 -- 
 -- currentUser ∷ ∀ eff user. Run ( auth ∷ AUTH user | eff ) (Maybe (User user))
 -- currentUser = Run.lift _auth (CurrentUser identity)

src/WebRow/Applets/Auth/Forms.purs

@@ -4,23 +4,22 @@ import Prelude
 
 import Data.Either (note)
 import Data.Validation.Semigroup (V(..))
-import Data.Variant (Variant)
 import Polyform.Batteries (Msg, error) as Batteries
 import Polyform.Batteries.UrlEncoded.Validators (MissingValue)
 import Polyform.Validator (liftFnMV) as Validator
-import Run (Run(..))
-import Type.Prelude (SProxy(..))
+import Run (Run)
+import Type.Prelude (Proxy(..))
 import Type.Row (type (+))
-import WebRow.Applets.Auth.Effects (Auth, authenticate) as Effects
-import WebRow.Applets.Auth.Effects (User)
+import WebRow.Applets.Auth.Effects (authenticate) as Effects
+import WebRow.Applets.Auth.Effects (User, AUTH)
 import WebRow.Applets.Auth.Types (Password(..))
 import WebRow.Forms (Uni, Layout) as Forms
 import WebRow.Forms.Uni (Builder, build, emailInputBuilder, passwordInputBuilder, sectionValidator) as Uni
 import WebRow.Forms.Validators (InvalidEmailFormat)
 import WebRow.Forms.Widgets (TextInput)
 import WebRow.Mailer (Email)
 
-_authFailed = SProxy ∷ SProxy "authFailed"
+_authFailed = Proxy ∷ Proxy "authFailed"
 
 type Msg = Batteries.Msg (AuthFailed + MissingValue + InvalidEmailFormat + ())
 
@@ -37,9 +36,9 @@ type AuthFailed r
   = ( authFailed ∷ AuthPayload | r )
 
 loginForm ::
-  forall eff errs user.
+  forall eff user.
   Forms.Uni
-    (Run (Effects.Auth user + eff))
+    (Run (AUTH user + eff))
     Msg
     (TextInput () + ())
     (User user)
@@ -49,9 +48,9 @@ loginForm =
     <<< ({ email: _, password: _ } <$> emailFormBuilder <*> passwordFormBuilder)
   where
   autheticateBuilder ∷
-    ∀ errs' widgets'.
+    ∀ widgets'.
     Uni.Builder
-      (Run (Effects.Auth user + eff))
+      (Run (AUTH user + eff))
       Msg
       -- (AuthFailed + errs')
       widgets'