Slightly nicer error displays

Author: supermario

ext-common/Ext/TypeHash.hs

@@ -87,21 +87,12 @@ calculateHashes pkg modul targetTypes canonical interfaces inDebug = do
 
   if List.length errors > 0
     then
-      let
-        -- !x = onlyWhen inDebug $ formatHaskellValue "diffHasErrors:" typediffs :: IO ()
-
-        notifyWarnings =
-          if List.length warnings > 0 then
-            [ D.reflow $ "Warning: also, a number of types outside Types.elm are referenced, see `lamdera check` for more info." ]
-          else
-            []
-      in
       Left $
         Exit.BuildLamderaProblem "WIRE ISSUES"
-          "I ran into the following problems when checking Lamdera core types:"
+          "I found one or more Route Modules with Data types that contain functions."
           (formattedErrors ++
           [ D.reflow "See <https://dashboard.lamdera.app/docs/wire> for more info."
-          ] ++ notifyWarnings)
+          ])
 
     else do
       Right (hashes, warnings)
@@ -546,13 +537,24 @@ diffableTypeErrors dtype =
   case dtype of
     DRecord fields ->
       fields
-        & fmap (\(n, tipe) -> diffableTypeErrors tipe)
+        & fmap (\(n, tipe) -> do
+            let errors = diffableTypeErrors tipe
+            case errors of
+              [] -> []
+              xs -> errors & fmap (\err -> "{ " <> n <> " } " <> err )
+          )
         & List.concat
 
     DCustom name constructors ->
       constructors
         & fmap (\(n, params) ->
-            fmap diffableTypeErrors params
+            params
+              & fmap (\param -> do
+                  let errors = diffableTypeErrors param
+                  case errors of
+                    [] -> []
+                    xs -> errors & fmap (\err -> n <> " " <> err)
+                )
               & List.concat
           )
         & List.concat

extra/Lamdera/Compile.hs

@@ -82,7 +82,8 @@ makeDev root path = do
   absRoot <- Dir.makeAbsolute root
 
   r <- async $
-    Dir.withCurrentDirectory absRoot $
+    Dir.withCurrentDirectory absRoot $ do
+      touch path
       Make.run [path] $
         Make.Flags
           { _debug = True

test/Test/Ext/ElmPages/Check.hs

@@ -2,6 +2,8 @@
 
 module Test.Ext.ElmPages.Check where
 
+import qualified Data.Text as T
+
 import EasyTest
 import Test.Helpers
 
@@ -14,9 +16,13 @@ all = EasyTest.run suite
 suite :: Test ()
 suite = tests $
   [ scope "isWireCompatible" $ do
-      actual <- catchOutput $
+      io $ setEnv "LDEBUG" "1"
+
+      actual <- catchOutputStdErr $
         Lamdera.Compile.makeDev "./test/scenario-elm-pages-incompatible-wire/.elm-pages" "Main.elm"
 
+      io $ atomicPutStrLn $ T.unpack actual
+
       expectTextContains actual
         "PageData:\\n\\n- must not contain functions"
   ]

test/Test/Helpers.hs

@@ -3,11 +3,13 @@ module Test.Helpers where
 import System.Environment (setEnv, unsetEnv, lookupEnv)
 import System.FilePath ((</>))
 import Data.Text as T
+import qualified Data.Text.Encoding as T
 
 import EasyTest
 
 import Lamdera
 import Test.Main (captureProcessResult)
+import qualified Test.Main
 
 
 aggressiveCacheClear :: FilePath -> IO ()
@@ -59,3 +61,10 @@ catchOutput action = do
   pr <- io $ captureProcessResult action
   -- @TODO improve this to actually pull out values
   pure $ show_ pr
+
+catchOutputStdErr :: IO () -> Test Text
+catchOutputStdErr action = do
+  -- https://hackage.haskell.org/package/main-tester-0.2.0.1/docs/Test-Main.html
+  pr <- io $ captureProcessResult action
+  -- @TODO improve this to actually pull out values
+  pure $ T.decodeUtf8 $ Test.Main.prStderr pr