Closes 99designs#2523 99designs#2541

atzedus · Mar 6, 2023 · 1146d1e · 1146d1e
1 parent a544ab0
commit 1146d1e
Show file tree

Hide file tree

Showing 13 changed files with 198 additions and 12 deletions.
diff --git a/codegen/testserver/followschema/nulls.graphql b/codegen/testserver/followschema/nulls.graphql
@@ -4,10 +4,11 @@ extend type Query {
     errorList: [Error]
     errors: Errors
     valid: String!
+    invalid: String!
 }
 
 extend type Subscription {
-	errorRequired: Error!
+    errorRequired: Error!
 }
 
 type Errors {

diff --git a/codegen/testserver/followschema/nulls_test.go b/codegen/testserver/followschema/nulls_test.go
@@ -2,6 +2,7 @@ package followschema
 
 import (
 	"context"
+	"errors"
 	"testing"
 
 	"github.com/99designs/gqlgen/client"
@@ -14,6 +15,9 @@ func TestNullBubbling(t *testing.T) {
 	resolvers.QueryResolver.Valid = func(ctx context.Context) (s string, e error) {
 		return "Ok", nil
 	}
+	resolvers.QueryResolver.Invalid = func(ctx context.Context) (s string, e error) {
+		return "Ok", errors.New("ERROR")
+	}
 	resolvers.QueryResolver.Errors = func(ctx context.Context) (errors *Errors, e error) {
 		return &Errors{}, nil
 	}
@@ -132,4 +136,12 @@ func TestNullBubbling(t *testing.T) {
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "the requested element is null which the schema does not allow")
 	})
+
+	t.Run("when non-nullable field returns content while error occured", func(t *testing.T) {
+		var resp any
+		err := c.Post(`query { invalid }`, &resp)
+		require.Nil(t, resp)
+		require.NotNil(t, err)
+		require.Contains(t, err.Error(), `{"message":"ERROR","path":["invalid"]}`)
+	})
 }
diff --git a/codegen/testserver/followschema/resolver.go b/codegen/testserver/followschema/resolver.go
@@ -337,6 +337,11 @@ func (r *queryResolver) Valid(ctx context.Context) (string, error) {
 	panic("not implemented")
 }
 
+// // foo
+func (r *queryResolver) Invalid(ctx context.Context) (string, error) {
+	panic("not implemented")
+}
+
 // // foo
 func (r *queryResolver) Panics(ctx context.Context) (*Panics, error) {
 	panic("not implemented")

diff --git a/codegen/testserver/followschema/root_.generated.go b/codegen/testserver/followschema/root_.generated.go
diff --git a/codegen/testserver/followschema/schema.generated.go b/codegen/testserver/followschema/schema.generated.go
diff --git a/codegen/testserver/followschema/stub.go b/codegen/testserver/followschema/stub.go
diff --git a/codegen/testserver/singlefile/generated.go b/codegen/testserver/singlefile/generated.go
diff --git a/codegen/testserver/singlefile/nulls.graphql b/codegen/testserver/singlefile/nulls.graphql
@@ -4,10 +4,11 @@ extend type Query {
     errorList: [Error]
     errors: Errors
     valid: String!
+    invalid: String!
 }
 
 extend type Subscription {
-	errorRequired: Error!
+    errorRequired: Error!
 }
 
 type Errors {

diff --git a/codegen/testserver/singlefile/nulls_test.go b/codegen/testserver/singlefile/nulls_test.go
@@ -2,6 +2,7 @@ package singlefile
 
 import (
 	"context"
+	"errors"
 	"testing"
 
 	"github.com/99designs/gqlgen/client"
@@ -14,6 +15,9 @@ func TestNullBubbling(t *testing.T) {
 	resolvers.QueryResolver.Valid = func(ctx context.Context) (s string, e error) {
 		return "Ok", nil
 	}
+	resolvers.QueryResolver.Invalid = func(ctx context.Context) (s string, e error) {
+		return "Ok", errors.New("ERROR")
+	}
 	resolvers.QueryResolver.Errors = func(ctx context.Context) (errors *Errors, e error) {
 		return &Errors{}, nil
 	}
@@ -132,4 +136,12 @@ func TestNullBubbling(t *testing.T) {
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "the requested element is null which the schema does not allow")
 	})
+
+	t.Run("when non-nullable field returns content while error occured", func(t *testing.T) {
+		var resp any
+		err := c.Post(`query { invalid }`, &resp)
+		require.Nil(t, resp)
+		require.NotNil(t, err)
+		require.Contains(t, err.Error(), `{"message":"ERROR","path":["invalid"]}`)
+	})
 }
diff --git a/codegen/testserver/singlefile/resolver.go b/codegen/testserver/singlefile/resolver.go
@@ -337,6 +337,11 @@ func (r *queryResolver) Valid(ctx context.Context) (string, error) {
 	panic("not implemented")
 }
 
+// // foo
+func (r *queryResolver) Invalid(ctx context.Context) (string, error) {
+	panic("not implemented")
+}
+
 // // foo
 func (r *queryResolver) Panics(ctx context.Context) (*Panics, error) {
 	panic("not implemented")

diff --git a/codegen/testserver/singlefile/stub.go b/codegen/testserver/singlefile/stub.go
diff --git a/plugin/resolvergen/testdata/filetemplate/out/schema.custom.go b/plugin/resolvergen/testdata/filetemplate/out/schema.custom.go