Merge pull request #46 from OxfordAbstracts/better-type-errors-#45

roryc89 · web-flow · commit ac4d448b318c · 2021-06-24T17:28:14.000+01:00
Better type errors #45
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,9 +10,9 @@ jobs:
 
       - uses: purescript-contrib/setup-purescript@main
         with:
-          purescript: "0.14.1"
+          purescript: "0.14.2"
           psa: "0.8.2"
-          spago: "0.20.1"
+          spago: "0.20.3"
 
       - name: Cache PureScript dependencies
         uses: actions/cache@v2
diff --git a/e2e/1-affjax/packages.dhall b/e2e/1-affjax/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/e2e/2-purty/packages.dhall b/e2e/2-purty/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/e2e/3-comments/packages.dhall b/e2e/3-comments/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/examples/1-simple/packages.dhall b/examples/1-simple/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/examples/2-codegen/packages.dhall b/examples/2-codegen/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/examples/3-enums/packages.dhall b/examples/3-enums/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/examples/4-mutation/packages.dhall b/examples/4-mutation/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/examples/5-subscription/packages.dhall b/examples/5-subscription/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/examples/6-watch-query/packages.dhall b/examples/6-watch-query/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/examples/7-watch-query-optimistic/packages.dhall b/examples/7-watch-query-optimistic/packages.dhall
@@ -111,6 +111,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/packages.dhall b/packages.dhall
@@ -105,6 +105,6 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
 
 in  upstream
diff --git a/run-should-fail-tests.js b/run-should-fail-tests.js
@@ -30,6 +30,7 @@ const go = async () => {
         ok(simplify(stderr, 0, 100).includes(simplify(expectedError, 4, 20)))
       } catch (e) {
         console.log('stderr: \n', stderr)
+        console.info('simplified error', simplify(stderr, 0, 100))
         throw e
       }
       console.log(`test passed: ${p}`)
diff --git a/should-fail-tests/not-null-arg-ignored/expected-error.txt b/should-fail-tests/not-null-arg-ignored/expected-error.txt
@@ -1,33 +1,15 @@
-Error found:
-in module Main
-at src/Main.purs:32:7 - 32:35 (line 32, column 7 - line 32, column 35)
-
-  Could not match type
-
-    True
-
-  with type
-
-    False
-
-
+A custom type error occurred while solving type class constraints:
+An `IgnoreArg` query argument cannot be used with with required schema argument:
+Schema: Boolean
+Query: IgnoreArg
 while solving type class constraint
-
-  Data.Typelevel.Bool.Or t3
-                         t4
-                         False
-
+GraphQL.Client.Args.IsNotNull Boolean
+IgnoreArg
 while applying a function queryReturns
-  of type QueryReturns t0 t1 t2 => Proxy t0 -> t1 -> Proxy t2
-  to argument testSchemaProxy
+of type QueryReturns t0 t1 t2 => Proxy @Type t0 -> t1 -> Proxy @Type t2
+to argument testSchemaProxy
 while inferring the type of queryReturns testSchemaProxy
 in value declaration passing1
-
-where t2 is an unknown type
-      t1 is an unknown type
-      t0 is an unknown type
-      t3 is an unknown type
-      t4 is an unknown type
-
-See https://github.com/purescript/documentation/blob/master/errors/TypesDoNotUnify.md for more information,
-or to contribute content related to this error.
+where t0 is an unknown type
+t1 is an unknown type
+t2 is an unknown type
diff --git a/should-fail-tests/not-null-arg-ignored/packages.dhall b/should-fail-tests/not-null-arg-ignored/packages.dhall
@@ -105,6 +105,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/should-fail-tests/not-null-arg-ignored/spago.dhall b/should-fail-tests/not-null-arg-ignored/spago.dhall
@@ -13,9 +13,9 @@ You can edit this file as you like.
   , "effect"
   , "foreign-generic"
   , "foreign-object"
+  , "halogen-subscriptions"
   , "heterogeneous"
   , "parsing"
-  , "proxy"
   , "psci-support"
   , "record"
   , "spec"
diff --git a/should-fail-tests/not-null-arg-is-nothing/expected-error.txt b/should-fail-tests/not-null-arg-is-nothing/expected-error.txt
@@ -1,30 +1,15 @@
-Error found:
-in module Main
-at src/Main.purs:33:7 - 33:35 (line 33, column 7 - line 33, column 35)
-
-  Could not match type
-
-    True
-
-  with type
-
-    False
-
-
+A custom type error occurred while solving type class constraints:
+A `Maybe` query argument cannot be used with with required schema argument:
+Schema: Boolean
+Query: Maybe Boolean
 while solving type class constraint
-
-  GraphQL.Client.Args.IsMaybeOrIgnored (Maybe Boolean)
-                                       False
-
+GraphQL.Client.Args.IsNotNull Boolean
+(Maybe Boolean)
 while applying a function queryReturns
-  of type QueryReturns t0 t1 t2 => Proxy t0 -> t1 -> Proxy t2
-  to argument testSchemaProxy
+of type QueryReturns t0 t1 t2 => Proxy @Type t0 -> t1 -> Proxy @Type t2
+to argument testSchemaProxy
 while inferring the type of queryReturns testSchemaProxy
 in value declaration passing1
-
-where t2 is an unknown type
-      t1 is an unknown type
-      t0 is an unknown type
-
-See https://github.com/purescript/documentation/blob/master/errors/TypesDoNotUnify.md for more information,
-or to contribute content related to this error.
+where t0 is an unknown type
+t1 is an unknown type
+t2 is an unknown type
diff --git a/should-fail-tests/not-null-arg-is-nothing/packages.dhall b/should-fail-tests/not-null-arg-is-nothing/packages.dhall
@@ -105,6 +105,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/should-fail-tests/not-null-arg-not-there/expected-error.txt b/should-fail-tests/not-null-arg-not-there/expected-error.txt
@@ -1,34 +1,19 @@
-Error found:
-in module Main
-at src/Main.purs:32:7 - 32:35 (line 32, column 7 - line 32, column 35)
-
-  Could not match type
-
-    ( online :: t0
-    | t1
-    )
-
-  with type
-
-    ()
-
-
+Could not match type
+( online :: t0
+| t1
+)
+with type
+() @Type
 while trying to match type ( online :: t0
-                           | t1
-                           )
-  with type ()
+| t1
+)
+with type () @Type
 while solving type class constraint
-
-  Prim.Row.Cons "online"
-                t0
-                t1
-                ()
-
+Prim.Row.Cons "online"
+t0
+t1
+(() @Type)
 while inferring the type of queryReturns testSchemaProxy
 in value declaration passing1
-
 where t0 is an unknown type
-      t1 is an unknown type
-
-See https://github.com/purescript/documentation/blob/master/errors/TypesDoNotUnify.md for more information,
-or to contribute content related to this error.
+t1 is an unknown type
diff --git a/should-fail-tests/not-null-arg-not-there/packages.dhall b/should-fail-tests/not-null-arg-not-there/packages.dhall
@@ -105,6 +105,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
+
 
 in  upstream
diff --git a/src/GraphQL/Client/Args.purs b/src/GraphQL/Client/Args.purs
diff --git a/src/GraphQL/Client/QueryReturns.purs b/src/GraphQL/Client/QueryReturns.purs

-Original file line number
+Diff line change
 -------------------------------
 -}
 let upstream =
 -      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210419/packages.dhall sha256:d9a082ffb5c0fabf689574f0680e901ca6f924e01acdbece5eeedd951731375a
 +      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210622/packages.dhall sha256:c4949646febb03c7b1f329c9f48921c3a1e6afee133330fd24b5aa4a88112973
++
 in  upstream