Ported changes for gqlerrors

- Include originalError in GraphQL error to preserve any additional info
	- Fixes graphql-go#251
	- graphql/graphql-js@3d27953

- Remove remaining references to u2028 and u2029
  	- graphql/graphql-js@5ee1edc

gqlerrors/error.go

@@ -9,20 +9,21 @@ import (
 )
 
 type Error struct {
-	Message   string
-	Stack     string
-	Nodes     []ast.Node
-	Source    *source.Source
-	Positions []int
-	Locations []location.SourceLocation
+	Message       string
+	Stack         string
+	Nodes         []ast.Node
+	Source        *source.Source
+	Positions     []int
+	Locations     []location.SourceLocation
+	OriginalError error
 }
 
 // implements Golang's built-in `error` interface
 func (g Error) Error() string {
 	return fmt.Sprintf("%v", g.Message)
 }
 
-func NewError(message string, nodes []ast.Node, stack string, source *source.Source, positions []int) *Error {
+func NewError(message string, nodes []ast.Node, stack string, source *source.Source, positions []int, origError error) *Error {
 	if stack == "" && message != "" {
 		stack = message
 	}
@@ -49,11 +50,12 @@ func NewError(message string, nodes []ast.Node, stack string, source *source.Sou
 		locations = append(locations, loc)
 	}
 	return &Error{
-		Message:   message,
-		Stack:     stack,
-		Nodes:     nodes,
-		Source:    source,
-		Positions: positions,
-		Locations: locations,
+		Message:       message,
+		Stack:         stack,
+		Nodes:         nodes,
+		Source:        source,
+		Positions:     positions,
+		Locations:     locations,
+		OriginalError: origError,
 	}
 }

gqlerrors/located.go

@@ -1,16 +1,23 @@
 package gqlerrors
 
 import (
+	"errors"
 	"github.com/graphql-go/graphql/language/ast"
 )
 
+// NewLocatedError
+// @deprecated 0.4.18
+// Already exists in `graphql.NewLocatedError()`
 func NewLocatedError(err interface{}, nodes []ast.Node) *Error {
+	var origError error
 	message := "An unknown error occurred."
 	if err, ok := err.(error); ok {
 		message = err.Error()
+		origError = err
 	}
 	if err, ok := err.(string); ok {
 		message = err
+		origError = errors.New(err)
 	}
 	stack := message
 	return NewError(
@@ -19,6 +26,7 @@ func NewLocatedError(err interface{}, nodes []ast.Node) *Error {
 		stack,
 		nil,
 		[]int{},
+		origError,
 	)
 }
 

gqlerrors/syntax.go

@@ -17,6 +17,7 @@ func NewSyntaxError(s *source.Source, position int, description string) *Error {
 		"",
 		s,
 		[]int{position},
+		nil,
 	)
 }
 
@@ -26,7 +27,7 @@ func highlightSourceAtLocation(s *source.Source, l location.SourceLocation) stri
 	lineNum := fmt.Sprintf("%d", line)
 	nextLineNum := fmt.Sprintf("%d", (line + 1))
 	padLen := len(nextLineNum)
-	lines := regexp.MustCompile("\r\n|[\n\r\u2028\u2029]").Split(s.Body, -1)
+	lines := regexp.MustCompile("\r\n|[\n\r]").Split(s.Body, -1)
 	var highlight string
 	if line >= 2 {
 		highlight += fmt.Sprintf("%s: %s\n", lpad(padLen, prevLineNum), lines[line-2])

language/lexer/lexer_test.go

@@ -171,24 +171,6 @@ func TestLexReportsUsefulStringErrors(t *testing.T) {
 			Body: "\"multi\rline\"",
 			Expected: `Syntax Error GraphQL (1:7) Unterminated string.
 
-1: "multi
-         ^
-2: line"
-`,
-		},
-		Test{
-			Body: "\"multi\u2028line\"",
-			Expected: `Syntax Error GraphQL (1:7) Unterminated string.
-
-1: "multi
-         ^
-2: line"
-`,
-		},
-		Test{
-			Body: "\"multi\u2029line\"",
-			Expected: `Syntax Error GraphQL (1:7) Unterminated string.
-
 1: "multi
          ^
 2: line"

located.go

@@ -1,17 +1,21 @@
 package graphql
 
 import (
+	"errors"
 	"github.com/graphql-go/graphql/gqlerrors"
 	"github.com/graphql-go/graphql/language/ast"
 )
 
 func NewLocatedError(err interface{}, nodes []ast.Node) *gqlerrors.Error {
+	var origError error
 	message := "An unknown error occurred."
 	if err, ok := err.(error); ok {
 		message = err.Error()
+		origError = err
 	}
 	if err, ok := err.(string); ok {
 		message = err
+		origError = errors.New(err)
 	}
 	stack := message
 	return gqlerrors.NewError(
@@ -20,6 +24,7 @@ func NewLocatedError(err interface{}, nodes []ast.Node) *gqlerrors.Error {
 		stack,
 		nil,
 		[]int{},
+		origError,
 	)
 }
 

rules.go

@@ -52,6 +52,7 @@ func newValidationRuleError(message string, nodes []ast.Node) (string, error) {
 		"",
 		nil,
 		[]int{},
+		nil, // TODO: this is interim, until we port "better-error-messages-for-inputs"
 	)
 }
 

values.go

@@ -77,6 +77,7 @@ func getVariableValue(schema Schema, definitionAST *ast.VariableDefinition, inpu
 			"",
 			nil,
 			[]int{},
+			nil,
 		)
 	}
 
@@ -99,6 +100,7 @@ func getVariableValue(schema Schema, definitionAST *ast.VariableDefinition, inpu
 			"",
 			nil,
 			[]int{},
+			nil,
 		)
 	}
 	inputStr := ""
@@ -113,6 +115,7 @@ func getVariableValue(schema Schema, definitionAST *ast.VariableDefinition, inpu
 		"",
 		nil,
 		[]int{},
+		nil,
 	)
 }