More minor tweaks

Signed-off-by: Steve Coffman <steve@khanacademy.org>
vektah · Sep 7, 2023 · 4cbcf03 · 4cbcf03
1 parent 77ba251
commit 4cbcf03
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/ast/path.go b/ast/path.go
@@ -18,6 +18,9 @@ var _ PathElement = PathIndex(0)
 var _ PathElement = PathName("")
 
 func (path *Path) String() string {
+	if path == nil {
+		return ""
+	}
 	var str bytes.Buffer
 	for i, v := range *path {
 		switch v := v.(type) {

diff --git a/gqlerror/error.go b/gqlerror/error.go
@@ -72,6 +72,13 @@ func (err *Error) Unwrap() error {
 	return err.err
 }
 
+func (err *Error) AsError() error {
+	if err == nil {
+		return nil
+	}
+	return err
+}
+
 func (errs List) Error() string {
 	var buf bytes.Buffer
 	for _, err := range errs {

diff --git a/parser/schema.go b/parser/schema.go
@@ -6,6 +6,18 @@ import (
 	"github.com/vektah/gqlparser/v2/lexer"
 )
 
+func ParseSchemas(inputs ...*Source) (*SchemaDocument, error) {
+	sd := &SchemaDocument{}
+	for _, input := range inputs {
+		inputAst, err := ParseSchema(input)
+		if err != nil {
+			return nil, err
+		}
+		sd.Merge(inputAst)
+	}
+	return sd, nil
+}
+
 func ParseSchema(source *Source) (*SchemaDocument, error) {
 	p := parser{
 		lexer: lexer.New(source),
@@ -25,18 +37,6 @@ func ParseSchema(source *Source) (*SchemaDocument, error) {
 	return sd, nil
 }
 
-func ParseSchemas(inputs ...*Source) (*SchemaDocument, error) {
-	sd := &SchemaDocument{}
-	for _, input := range inputs {
-		inputAst, err := ParseSchema(input)
-		if err != nil {
-			return nil, err
-		}
-		sd.Merge(inputAst)
-	}
-	return sd, nil
-}
-
 func (p *parser) parseSchemaDocument() *SchemaDocument {
 	var doc SchemaDocument
 	doc.Position = p.peekPos()