rename marshaler methods

codegen/input_build.go

@@ -1,7 +1,9 @@
 package codegen
 
 import (
+	"fmt"
 	"go/types"
+	"os"
 	"sort"
 	"strings"
 
@@ -17,7 +19,11 @@ func buildInputs(namedTypes NamedTypes, s *schema.Schema, prog *loader.Program)
 		case *schema.InputObject:
 			input := buildInput(namedTypes, typ)
 
-			if def := findGoType(prog, input.Package, input.GoType); def != nil {
+			def, err := findGoType(prog, input.Package, input.GoType)
+			if err != nil {
+				fmt.Fprintf(os.Stderr, err.Error())
+			}
+			if def != nil {
 				input.Marshaler = buildInputMarshaler(typ, def)
 				bindObject(def.Type(), input)
 			}

codegen/object_build.go

@@ -1,6 +1,8 @@
 package codegen
 
 import (
+	"fmt"
+	"os"
 	"sort"
 	"strings"
 
@@ -16,7 +18,11 @@ func buildObjects(types NamedTypes, s *schema.Schema, prog *loader.Program) Obje
 		case *schema.Object:
 			obj := buildObject(types, typ)
 
-			if def := findGoType(prog, obj.Package, obj.GoType); def != nil {
+			def, err := findGoType(prog, obj.Package, obj.GoType)
+			if err != nil {
+				fmt.Fprintf(os.Stderr, err.Error())
+			}
+			if def != nil {
 				bindObject(def.Type(), obj)
 			}
 

codegen/type.go

@@ -72,7 +72,7 @@ func (t Type) Unmarshal(result, raw string) string {
 
 func (t Type) Marshal(result, val string) string {
 	if t.Marshaler != nil {
-		return result + " = " + t.Marshaler.pkgDot() + "" /* Marshal */ + t.Marshaler.GoType + "(" + val + ")"
+		return result + " = " + t.Marshaler.pkgDot() + "Marshal" + t.Marshaler.GoType + "(" + val + ")"
 	}
 
 	return result + " = " + val

codegen/type_build.go

@@ -32,27 +32,18 @@ func buildNamedTypes(s *schema.Schema, userTypes map[string]string) NamedTypes {
 }
 
 func bindTypes(imports Imports, namedTypes NamedTypes, prog *loader.Program) {
-	fmt.Println(namedTypes)
 	for _, t := range namedTypes {
 		if t.Package == "" {
-			fmt.Println("NO PKG", t)
 			continue
 		}
 
-		def := findGoType(prog, t.Package, t.GoType)
-		if def == nil {
-
-		}
-		fmt.Println("Looking at " + t.FullName())
+		def, _ := findGoType(prog, t.Package, "Marshal"+t.GoType)
 		switch def := def.(type) {
 		case *types.Func:
-
-			fmt.Println(def.String())
 			sig := def.Type().(*types.Signature)
 			cpy := t.Ref
 			t.Marshaler = &cpy
 
-			fmt.Println("sig: " + sig.Params().At(0).Type().String())
 			t.Package, t.GoType = pkgAndType(sig.Params().At(0).Type().String())
 			t.Import = imports.findByName(t.Package)
 		}

codegen/util.go

@@ -9,33 +9,33 @@ import (
 	"golang.org/x/tools/go/loader"
 )
 
-func findGoType(prog *loader.Program, pkgName string, typeName string) types.Object {
+func findGoType(prog *loader.Program, pkgName string, typeName string) (types.Object, error) {
+	if pkgName == "" {
+		return nil, nil
+	}
 	fullName := typeName
 	if pkgName != "" {
 		fullName = pkgName + "." + typeName
 	}
 
 	pkgName, err := resolvePkg(pkgName)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "unable to resolve package for %s: %s\n", fullName, err.Error())
-		return nil
+		return nil, fmt.Errorf("unable to resolve package for %s: %s\n", fullName, err.Error())
 	}
 
 	pkg := prog.Imported[pkgName]
 	if pkg == nil {
-		fmt.Fprintf(os.Stderr, "required package was not loaded: %s", fullName)
-		return nil
+		return nil, fmt.Errorf("required package was not loaded: %s", fullName)
 	}
 
 	for astNode, def := range pkg.Defs {
 		if astNode.Name != typeName || isMethod(def) {
 			continue
 		}
 
-		return def
+		return def, nil
 	}
-	fmt.Fprintf(os.Stderr, "unable to find type %s\n", fullName)
-	return nil
+	return nil, fmt.Errorf("unable to find type %s\n", fullName)
 }
 
 func isMethod(t types.Object) bool {

graphql/bool.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 )
 
-func Boolean(b bool) Marshaler {
+func MarshalBoolean(b bool) Marshaler {
 	return WriterFunc(func(w io.Writer) {
 		if b {
 			w.Write(trueLit)

graphql/error.go

@@ -4,7 +4,7 @@ import (
 	"github.com/vektah/gqlgen/neelance/errors"
 )
 
-func Errors(errs []*errors.QueryError) Marshaler {
+func MarshalErrors(errs []*errors.QueryError) Marshaler {
 	res := Array{}
 
 	for _, err := range errs {
@@ -15,14 +15,14 @@ func Errors(errs []*errors.QueryError) Marshaler {
 
 		errObj := &OrderedMap{}
 
-		errObj.Add("message", String(err.Message))
+		errObj.Add("message", MarshalString(err.Message))
 
 		if len(err.Locations) > 0 {
 			locations := Array{}
 			for _, location := range err.Locations {
 				locationObj := &OrderedMap{}
-				locationObj.Add("line", Int(location.Line))
-				locationObj.Add("column", Int(location.Column))
+				locationObj.Add("line", MarshalInt(location.Line))
+				locationObj.Add("column", MarshalInt(location.Column))
 
 				locations = append(locations, locationObj)
 			}

graphql/float.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 )
 
-func Float(f float64) Marshaler {
+func MarshalFloat(f float64) Marshaler {
 	return WriterFunc(func(w io.Writer) {
 		io.WriteString(w, fmt.Sprintf("%f", f))
 	})

graphql/id.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 )
 
-func ID(s string) Marshaler {
+func MarshalID(s string) Marshaler {
 	return WriterFunc(func(w io.Writer) {
 		io.WriteString(w, strconv.Quote(s))
 	})

graphql/int.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 )
 
-func Int(i int) Marshaler {
+func MarshalInt(i int) Marshaler {
 	return WriterFunc(func(w io.Writer) {
 		io.WriteString(w, strconv.Itoa(i))
 	})

graphql/string.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 )
 
-func String(s string) Marshaler {
+func MarshalString(s string) Marshaler {
 	return WriterFunc(func(w io.Writer) {
 		io.WriteString(w, strconv.Quote(s))
 	})

graphql/time.go

@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-func Time(t time.Time) Marshaler {
+func MarshalTime(t time.Time) Marshaler {
 	return WriterFunc(func(w io.Writer) {
 		io.WriteString(w, strconv.Quote(t.Format(time.RFC3339)))
 	})

templates/file.go

@@ -61,7 +61,7 @@ func NewExecutor(resolvers Resolvers) func(context.Context, string, string, map[
 		result.Add("data", data)
 
 		if len(c.Errors) > 0 {
-			result.Add("errors", graphql.Errors(c.Errors))
+			result.Add("errors", graphql.MarshalErrors(c.Errors))
 		}
 
 		result.MarshalGQL(w)

templates/object.go

@@ -16,7 +16,7 @@ func (ec *executionContext) _{{$object.GQLType|lcFirst}}(sel []query.Selection,
 
 		switch field.Name {
 		case "__typename":
-			out.Values[i] = graphql.String({{$object.GQLType|quote}})
+			out.Values[i] = graphql.MarshalString({{$object.GQLType|quote}})
 		{{- range $field := $object.Fields }}
 		case "{{$field.GQLName}}":
 			{{- template "args" $field.Args }}