Fix remaining errors after merging #3.

Author: nsaunders

src/TypedEnv.purs

@@ -23,9 +23,7 @@ import Data.Maybe (Maybe(..))
 import Data.Number (fromString) as Number
 import Data.Show.Generic (genericShow)
 import Data.String.CodeUnits (uncons) as String
-import Data.String.Common (toLower, joinWith)
-import Data.Symbol (class IsSymbol, reflectSymbol)
-import Data.String.Common (toLower)
+import Data.String.Common (joinWith, toLower)
 import Data.Symbol (class IsSymbol, reflectSymbol)
 import Foreign.Object (Object, lookup)
 import Prim.Row (class Cons, class Lacks) as Row
@@ -45,17 +43,21 @@ fromEnv
 fromEnv = readEnv
 
 -- | An error that can occur while reading an environment variable
-data EnvError = EnvLookupError String | EnvParseError String | EnvErrors (Array EnvError)
+data EnvError
+  = EnvLookupError String
+  | EnvParseError String
+  | EnvErrors (Array EnvError)
 
 derive instance eqEnvError :: Eq EnvError
 
 derive instance genericEnvError :: Generic EnvError _
 
 instance semigroupEnvError :: Semigroup EnvError where
-  append (EnvErrors aErrors) (EnvErrors bErrors) = EnvErrors $ aErrors <> bErrors
-  append (EnvErrors errors) err = EnvErrors $ errors <> [err]
-  append err (EnvErrors errors) = EnvErrors $ [err] <> errors
-  append errA errB = EnvErrors [errA, errB]
+  append (EnvErrors aErrors) (EnvErrors bErrors) = EnvErrors $ aErrors <>
+    bErrors
+  append (EnvErrors errors) err = EnvErrors $ errors <> [ err ]
+  append err (EnvErrors errors) = EnvErrors $ [ err ] <> errors
+  append errA errB = EnvErrors [ errA, errB ]
 
 instance showEnvError :: Show EnvError where
   show (EnvErrors errors) = joinWith "\n" $ map genericShow errors
@@ -64,8 +66,10 @@ instance showEnvError :: Show EnvError where
 -- | Gets the error message for a given `EnvError` value.
 envErrorMessage :: EnvError -> String
 envErrorMessage = case _ of
-  EnvLookupError var -> "The required variable \"" <> var <> "\" was not specified."
-  EnvParseError var  -> "The variable \"" <> var <> "\" was formatted incorrectly."
+  EnvLookupError var -> "The required variable \"" <> var <>
+    "\" was not specified."
+  EnvParseError var -> "The variable \"" <> var <>
+    "\" was formatted incorrectly."
   EnvErrors errors -> joinWith "\n" $ map envErrorMessage errors
 
 -- | Parses a `String` value to the specified type.
@@ -143,16 +147,18 @@ instance readEnvFieldsCons ::
   , Row.Lacks name rt
   , Row.Cons name ty rt r
   , ReadValue ty
-  ) => ReadEnvFields (Cons name (Variable varName ty) elt) (Cons name ty rlt) r where
-    readEnvFields _ _ env = insert value tail
-      where
-      nameP = Proxy :: _ name
-      varName = reflectSymbol (Proxy :: _ varName)
-      value = readValue varName env
-      tail = readEnvFields (Proxy :: _ elt) (Proxy :: _ rlt) env
-
-      insert (Left valueErr) (Left tailErrs) = Left $ valueErr <> tailErrs
-      insert valE tailE = Record.insert nameP <$> valE <*> tailE
-
-instance readEnvFieldsNil :: TypeEquals {} (Record row) => ReadEnvFields Nil Nil row where
+  ) =>
+  ReadEnvFields (Cons name ty elt) (Cons name ty rlt) r where
+  readEnvFields _ _ env = insert value tail
+    where
+    nameP = Proxy :: _ name
+    value = readValue (reflectSymbol nameP) env
+    tail = readEnvFields (Proxy :: _ elt) (Proxy :: _ rlt) env
+
+    insert (Left valueErr) (Left tailErrs) = Left $ valueErr <> tailErrs
+    insert valE tailE = Record.insert nameP <$> valE <*> tailE
+
+instance readEnvFieldsNil ::
+  TypeEquals {} (Record row) =>
+  ReadEnvFields Nil Nil row where
   readEnvFields _ _ _ = pure $ to {}

test/Main.purs

@@ -44,9 +44,11 @@ main = launchAff_ $ runSpec [ consoleReporter ] $
 
     it "indicates when parsing multiple values has failed" do
       let
-        env = FO.fromHomogeneous { "A": "err"}
-        expected = Left (EnvErrors [EnvParseError "A", EnvLookupError "B"])
-        actual = fromEnv (RProxy :: RProxy (a :: Int <: "A", b :: String <: "B")) env
+        env = FO.fromHomogeneous { "A": "err" }
+        expected = Left (EnvErrors [ EnvParseError "A", EnvLookupError "B" ])
+        actual = fromEnv
+          (Proxy :: _ ("A" :: Int, "B" :: String))
+          env
       actual `shouldEqual` expected
 
     it "parses boolean values" do