Error reporting fixes. finos#33

AttilaMihaly · Dec 2, 2020 · bdf7785 · bdf7785
1 parent 24cefa6
commit bdf7785
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/cli/src/Morphir/Elm/CLI.elm b/cli/src/Morphir/Elm/CLI.elm
@@ -196,7 +196,7 @@ decodeError =
                             |> Decode.map FrontendError
 
                     "type_error" ->
-                        Decode.index 1 (Decode.succeed [])
+                        Decode.index 1 (Decode.list decodeValueTypeError)
                             |> Decode.map TypeError
 
                     other ->

diff --git a/src/Morphir/Type/Infer/Codec.elm b/src/Morphir/Type/Infer/Codec.elm
@@ -23,13 +23,10 @@ decodeValueTypeError : Decode.Decoder ValueTypeError
 decodeValueTypeError =
     Decode.map2 ValueTypeError
         (Decode.index 1 decodeName)
+        -- TODO: implement
         (Decode.succeed (TypeErrors []))
 
 
-
--- TODO: implement
-
-
 encodeTypeError : TypeError -> Encode.Value
 encodeTypeError typeError =
     case typeError of
@@ -47,30 +44,10 @@ encodeTypeError typeError =
                 ]
 
         LookupError lookupError ->
-            case lookupError of
-                CouldNotFindConstructor fQName ->
-                    Encode.list identity
-                        [ Encode.string "could_not_find_constructor"
-                        , encodeFQName fQName
-                        ]
-
-                CouldNotFindValue fQName ->
-                    Encode.list identity
-                        [ Encode.string "could_not_find_value"
-                        , encodeFQName fQName
-                        ]
-
-                CouldNotFindAlias fQName ->
-                    Encode.list identity
-                        [ Encode.string "could_not_find_alias"
-                        , encodeFQName fQName
-                        ]
-
-                ExpectedAlias fQName ->
-                    Encode.list identity
-                        [ Encode.string "expected_alias"
-                        , encodeFQName fQName
-                        ]
+            Encode.list identity
+                [ Encode.string "lookup_error"
+                , encodeLookupError lookupError
+                ]
 
         UnknownError message ->
             Encode.list identity
@@ -87,6 +64,34 @@ encodeTypeError typeError =
                 ]
 
 
+encodeLookupError : LookupError -> Encode.Value
+encodeLookupError lookupError =
+    case lookupError of
+        CouldNotFindConstructor fQName ->
+            Encode.list identity
+                [ Encode.string "could_not_find_constructor"
+                , encodeFQName fQName
+                ]
+
+        CouldNotFindValue fQName ->
+            Encode.list identity
+                [ Encode.string "could_not_find_value"
+                , encodeFQName fQName
+                ]
+
+        CouldNotFindAlias fQName ->
+            Encode.list identity
+                [ Encode.string "could_not_find_alias"
+                , encodeFQName fQName
+                ]
+
+        ExpectedAlias fQName ->
+            Encode.list identity
+                [ Encode.string "expected_alias"
+                , encodeFQName fQName
+                ]
+
+
 encodeUnificationError : UnificationError -> Encode.Value
 encodeUnificationError unificationError =
     case unificationError of