Update package set from 0.13.6-20200507 to 0.13.8-20201223 (#267)

milesfrain · web-flow · commit 4ca5fecd4188 · 2020-12-26T20:43:43.000-08:00
* Update package set from 0.13.6-20200507 to 0.13.8-20201223

* Ch10 - fix code broken by update

* Ch8 - update fixes
diff --git a/exercises/chapter10/packages.dhall b/exercises/chapter10/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter10/spago.dhall b/exercises/chapter10/spago.dhall
@@ -11,6 +11,7 @@ You can edit this file as you like.
   , "effect"
   , "pairs"
   , "psci-support"
+  , "react-basic-dom"
   , "react-basic-hooks"
   , "test-unit"
   , "validation"
diff --git a/exercises/chapter10/src/Main.purs b/exercises/chapter10/src/Main.purs
@@ -1,9 +1,10 @@
 module Main where
 
 import Prelude
+
 import Data.AddressBook (PhoneNumber, Person, examplePerson)
 import Data.AddressBook.Validation (Errors, validatePerson')
-import Data.Argonaut (Json, decodeJson, encodeJson, jsonParser, stringify)
+import Data.Argonaut (Json, decodeJson, encodeJson, jsonParser, printJsonDecodeError, stringify)
 import Data.Array (length, mapWithIndex, updateAt)
 import Data.Bifunctor (lmap)
 import Data.Either (Either(..))
@@ -156,9 +157,9 @@ mkAddressBookApp =
 
 processItem :: Json -> Either String Person
 processItem item = do
-  jsonString <- lmap ("No string in local storage: " <> _) $ decodeJson item
-  j          <- lmap ("Cannot parse JSON string: "   <> _) $ jsonParser jsonString
-  lmap               ("Cannot decode Person: "       <> _) $ decodeJson j
+  jsonString <- lmap (\e -> "No string in local storage: " <> printJsonDecodeError e) $ decodeJson item
+  j          <- lmap (      "Cannot parse JSON string: "   <> _)                      $ jsonParser jsonString
+  lmap               (\e -> "Cannot decode Person: "       <> printJsonDecodeError e) $ decodeJson j
 
 main :: Effect Unit
 main = do
diff --git a/exercises/chapter10/test/Examples.purs b/exercises/chapter10/test/Examples.purs
@@ -3,7 +3,7 @@ module Test.Examples where
 import Prelude
 
 import Control.Promise (Promise, toAffE)
-import Data.Argonaut (Json, decodeJson, encodeJson)
+import Data.Argonaut (Json, JsonDecodeError, decodeJson, encodeJson)
 import Data.Either (Either)
 import Data.Function.Uncurried (Fn2, mkFn2)
 import Data.Map (Map)
@@ -90,17 +90,17 @@ foreign import addComplexBroken :: Complex -> Complex -> Complex
 
 foreign import cumulativeSumsJson :: Array Int -> Json
 
-cumulativeSumsDecoded :: Array Int -> Either String (Array Int)
+cumulativeSumsDecoded :: Array Int -> Either JsonDecodeError (Array Int)
 cumulativeSumsDecoded arr = decodeJson $ cumulativeSumsJson arr
 
 foreign import addComplexJson :: Complex -> Complex -> Json
 
-addComplexDecoded :: Complex -> Complex -> Either String Complex
+addComplexDecoded :: Complex -> Complex -> Either JsonDecodeError Complex
 addComplexDecoded a b = decodeJson $ addComplexJson a b
 
 foreign import mapSetFooJson :: Json -> Json
 
-mapSetFoo :: Map String Int -> Either String (Map String Int)
+mapSetFoo :: Map String Int -> Either JsonDecodeError (Map String Int)
 mapSetFoo = encodeJson >>> mapSetFooJson >>> decodeJson
 
 {-
@@ -111,20 +111,20 @@ between versions by the reader.
 -}
 foreign import cumulativeSumsJsonBroken :: Array Int -> Json
 
-cumulativeSumsDecodedBroken :: Array Int -> Either String (Array Int)
+cumulativeSumsDecodedBroken :: Array Int -> Either JsonDecodeError (Array Int)
 cumulativeSumsDecodedBroken = cumulativeSumsJsonBroken >>> decodeJson
 
 foreign import addComplexJsonBroken :: Complex -> Complex -> Json
 
-addComplexDecodedBroken :: Complex -> Complex -> Either String Complex
+addComplexDecodedBroken :: Complex -> Complex -> Either JsonDecodeError Complex
 addComplexDecodedBroken a b = decodeJson $ addComplexJsonBroken a b
 
 foreign import cumulativeSumsJsonWorking :: Array Int -> Json
 
-cumulativeSumsDecodedWorking :: Array Int -> Either String (Array Int)
+cumulativeSumsDecodedWorking :: Array Int -> Either JsonDecodeError (Array Int)
 cumulativeSumsDecodedWorking = cumulativeSumsJsonWorking >>> decodeJson
 
 foreign import addComplexJsonWorking :: Complex -> Complex -> Json
 
-addComplexDecodedWorking :: Complex -> Complex -> Either String Complex
+addComplexDecodedWorking :: Complex -> Complex -> Either JsonDecodeError Complex
 addComplexDecodedWorking a b = decodeJson $ addComplexJsonWorking a b
diff --git a/exercises/chapter10/test/Main.purs b/exercises/chapter10/test/Main.purs
@@ -5,7 +5,7 @@ import Test.Examples
 import Test.MySolutions
 
 import Control.Monad.Free (Free)
-import Data.Argonaut (decodeJson, encodeJson)
+import Data.Argonaut (JsonDecodeError(..), decodeJson, encodeJson)
 import Data.Either (Either(..), isLeft)
 import Data.Function.Uncurried (runFn2, runFn3)
 import Data.Map as Map
@@ -144,11 +144,11 @@ main =
           { a: 3.0, b: -6.0, c: 3.0 }
           { real: 1.0, imag: 0.0 }
           { real: 1.0, imag: 0.0 }
-      test "Exercise - decodeArray2D" do
+      test "Exercise - parseAndDecodeArray2D" do
         let
           arr = [ [ 1, 2, 3 ], [ 4, 5 ], [ 6 ] ]
         Assert.equal (Right arr)
-          $ decodeArray2D
+          $ parseAndDecodeArray2D
           $ show arr -- the correct JSON string happens to also be produced by show
       test "Exercise - encode decode Tree" do
         let
@@ -284,14 +284,14 @@ runChapterExamples =
       Assert.equal 5.0 result
     suite "cumulativeSums Json" do
       test "broken" do
-        Assert.equal (Left "Couldn't decode Array (Failed at index 3): Value is not a Number")
+        Assert.equal (Left $ Named "Array" $ AtIndex 3 $ TypeMismatch "Number")
           $ cumulativeSumsDecodedBroken [ 1, 2, 3 ]
       test "working" do
         Assert.equal (Right [ 1, 3, 6 ])
           $ cumulativeSumsDecodedWorking [ 1, 2, 3 ]
     suite "addComplex Json" do
       test "broken" do
-        Assert.equal (Left "JSON was missing expected field: imag")
+        Assert.equal (Left $ AtKey "imag" MissingValue)
           $ addComplexDecodedBroken { real: 1.0, imag: 2.0 } { real: 3.0, imag: 4.0 }
       test "working" do
         Assert.equal (Right { imag: 6.0, real: 4.0 })
diff --git a/exercises/chapter10/test/MySolutions.purs b/exercises/chapter10/test/MySolutions.purs
@@ -1,11 +1,13 @@
 module Test.MySolutions where
 
 import Prelude
+
 import Control.Alt (alt)
 import Control.Apply (lift2)
-import Data.Argonaut (class DecodeJson, class EncodeJson, Json, decodeJson, encodeJson, jsonParser)
+import Data.Argonaut (class DecodeJson, class EncodeJson, Json, JsonDecodeError(..), decodeJson, encodeJson, jsonParser, printJsonDecodeError)
 import Data.Argonaut.Decode.Generic.Rep (genericDecodeJson)
 import Data.Argonaut.Encode.Generic.Rep (genericEncodeJson)
+import Data.Bifunctor (lmap)
 import Data.Either (Either(..))
 import Data.Foldable (foldr)
 import Data.Function.Uncurried (Fn3)
@@ -30,7 +32,7 @@ quadraticRoots poly = quadraticRootsImpl Pair poly
 
 foreign import valuesOfMapJson :: Json -> Json
 
-valuesOfMap :: Map String Int -> Either String (Set Int)
+valuesOfMap :: Map String Int -> Either JsonDecodeError (Set Int)
 valuesOfMap = encodeJson >>> valuesOfMapJson >>> decodeJson
 
 valuesOfMapGeneric ::
@@ -41,12 +43,12 @@ valuesOfMapGeneric ::
   Ord k =>
   Ord v =>
   Map k v ->
-  Either String (Set v)
+  Either JsonDecodeError (Set v)
 valuesOfMapGeneric = encodeJson >>> valuesOfMapJson >>> decodeJson
 
 foreign import quadraticRootsSetJson :: Json -> Json
 
-quadraticRootsSet :: Quadratic -> Either String (Set Complex)
+quadraticRootsSet :: Quadratic -> Either JsonDecodeError (Set Complex)
 quadraticRootsSet = encodeJson >>> quadraticRootsSetJson >>> decodeJson
 
 foreign import quadraticRootsSafeJson :: Json -> Json
@@ -59,18 +61,20 @@ instance decodeJsonWrapPair :: DecodeJson a => DecodeJson (WrapPair a) where
     decoded <- decodeJson j
     case decoded of
       [ a, b ] -> map WrapPair $ lift2 Pair (decodeJson a) (decodeJson b)
-      _ -> Left "Couldn't decode WrapPair"
+      [ ] -> Left $ AtIndex 0 MissingValue
+      [ a ] -> Left $ AtIndex 1 MissingValue
+      _ -> Left $ AtIndex 2 $ UnexpectedValue j
 
-quadraticRootsSafeWrap :: Quadratic -> Either String (WrapPair Complex)
+quadraticRootsSafeWrap :: Quadratic -> Either JsonDecodeError (WrapPair Complex)
 quadraticRootsSafeWrap = encodeJson >>> quadraticRootsSafeJson >>> decodeJson
 
-quadraticRootsSafe :: Quadratic -> Either String (Pair Complex)
+quadraticRootsSafe :: Quadratic -> Either JsonDecodeError (Pair Complex)
 quadraticRootsSafe = quadraticRootsSafeWrap >>> map (\(WrapPair p) -> p)
 
-decodeArray2D :: String -> Either String (Array (Array Int))
-decodeArray2D str = do
+parseAndDecodeArray2D :: String -> Either String (Array (Array Int))
+parseAndDecodeArray2D str = do
   j <- jsonParser str
-  decodeJson j
+  lmap printJsonDecodeError $ decodeJson j
 
 data Tree a
   = Leaf a
@@ -100,7 +104,7 @@ instance encodeJsonIntOrString :: EncodeJson IntOrString where
 
 instance decodeJsonIntOrString :: DecodeJson IntOrString where
   decodeJson j =
-    foldr alt (Left "Could not decode IntOrString")
+    foldr alt (Left $ TypeMismatch "Not Int or String")
       [ map IntOrString_Int $ decodeJson j
       , map IntOrString_String $ decodeJson j
       ]
diff --git a/exercises/chapter11/packages.dhall b/exercises/chapter11/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter12/packages.dhall b/exercises/chapter12/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter13/packages.dhall b/exercises/chapter13/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter14/packages.dhall b/exercises/chapter14/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter2/packages.dhall b/exercises/chapter2/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter3/packages.dhall b/exercises/chapter3/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter4/packages.dhall b/exercises/chapter4/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter5/packages.dhall b/exercises/chapter5/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter6/packages.dhall b/exercises/chapter6/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter7/packages.dhall b/exercises/chapter7/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter8/packages.dhall b/exercises/chapter8/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/exercises/chapter8/spago.dhall b/exercises/chapter8/spago.dhall
@@ -7,6 +7,7 @@ You can edit this file as you like.
   [ "console"
   , "effect"
   , "psci-support"
+  , "react-basic-dom"
   , "react-basic-hooks"
   , "test-unit"
   , "validation"
diff --git a/exercises/chapter8/test/Main.purs b/exercises/chapter8/test/Main.purs
@@ -3,8 +3,6 @@ module Test.Main where
 import Prelude
 import Test.MySolutions
 import Test.NoPeeking.Solutions  -- Note to reader: Delete this line
-import Data.AddressBook (examplePerson, PhoneType(..))
-import Data.Array (filter, null)
 import Data.List (List(..), foldM, (:))
 import Data.Maybe (Maybe(..))
 import Effect (Effect)
diff --git a/exercises/chapter9/packages.dhall b/exercises/chapter9/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/scripts/packages.dhall b/scripts/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200507/packages.dhall sha256:9c1e8951e721b79de1de551f31ecb5a339e82bbd43300eb5ccfb1bf8cf7bbd62
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
 
 let overrides =
       { test-unit =
diff --git a/text/chapter10.md b/text/chapter10.md
@@ -895,7 +895,7 @@ Map String Int
 1. (Medium) Rewrite the earlier `quadraticRoots` function as `quadraticRootsSet` which returns the `Complex` roots as a `Set` via JSON (instead of as a `Pair`).
 1. (Difficult) Rewrite the earlier `quadraticRoots` function as `quadraticRootsSafe` which uses JSON to pass the `Pair` of `Complex` roots over FFI. Don't use the `Pair` constructor in JavaScript, but instead, just return the pair in a decoder-compatible format.
 _Hint_: You'll need to write a `DecodeJson` instance for `Pair`. Consult the [argonaut docs](https://github.com/purescript-contrib/purescript-argonaut-codecs#writing-new-instances) for instruction on writing your own decode instance. Their [decodeJsonTuple](https://github.com/purescript-contrib/purescript-argonaut-codecs/blob/master/src/Data/Argonaut/Decode/Class.purs) instance may also be a helpful reference.  Note that you'll need a `newtype` wrapper for `Pair` to avoid creating an "orphan instance".
-1. (Medium) Write a `decodeArray2D :: String -> Either String (Array (Array Int))` function to parse and decode a JSON string containing a 2D array, such as `"[[1, 2, 3], [4, 5], [6]]"`. _Hint_: You'll need to use `jsonParser` to convert the `String` into `Json` before decoding.
+1. (Medium) Write a `parseAndDecodeArray2D :: String -> Either String (Array (Array Int))` function to parse and decode a JSON string containing a 2D array, such as `"[[1, 2, 3], [4, 5], [6]]"`. _Hint_: You'll need to use `jsonParser` to convert the `String` into `Json` before decoding.
 1. (Medium) The following data type represents a binary tree with values at the leaves:
 
      ```haskell
