Rebase on upstream

.circleci/config.yml

@@ -5,7 +5,7 @@ test_with_go_modules: &test_with_go_modules
     - run: go vet ./...
 
 test_without_go_modules: &test_without_go_modules
-  working_directory: /go/src/github.com/graphql-go/graphql
+  working_directory: /go/src/github.com/teamjobot/graphql
   steps:
     - checkout
     - run: go get -v -t -d ./...

CONTRIBUTING.md

@@ -4,7 +4,7 @@ This document is based on the [Node.js contribution guidelines](https://github.c
 
 ## Chat room
 
-[![Join the chat at https://gitter.im/graphql-go/graphql](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/graphql-go/graphql?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/teamjobot/graphql](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/teamjobot/graphql?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Feel free to participate in the chat room for informal discussions and queries.
 
@@ -55,8 +55,8 @@ The basics are as follows:
 2. `go get` the upstream repo and set it up as the `upstream` remote and your own repo as the `origin` remote:
 
 ```bash
-$ go get github.com/graphql-go/graphql
-$ cd $GOPATH/src/github.com/graphql-go/graphql
+$ go get github.com/teamjobot/graphql
+$ cd $GOPATH/src/github.com/teamjobot/graphql
 $ git remote rename origin upstream
 $ git remote add origin git@github.com/YOUR_GITHUB_NAME/graphql
 ```

README.md

@@ -1,18 +1,18 @@
-# graphql [![CircleCI](https://circleci.com/gh/graphql-go/graphql/tree/master.svg?style=svg)](https://circleci.com/gh/graphql-go/graphql/tree/master) [![GoDoc](https://godoc.org/graphql.co/graphql?status.svg)](https://godoc.org/github.com/graphql-go/graphql) [![Coverage Status](https://coveralls.io/repos/github/graphql-go/graphql/badge.svg?branch=master)](https://coveralls.io/github/graphql-go/graphql?branch=master) [![Join the chat at https://gitter.im/graphql-go/graphql](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/graphql-go/graphql?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# graphql [![CircleCI](https://circleci.com/gh/teamjobot/graphql/tree/master.svg?style=svg)](https://circleci.com/gh/teamjobot/graphql/tree/master) [![Go Reference](https://pkg.go.dev/badge/github.com/teamjobot/graphql.svg)](https://pkg.go.dev/github.com/teamjobot/graphql) [![Coverage Status](https://coveralls.io/repos/github/teamjobot/graphql/badge.svg?branch=master)](https://coveralls.io/github/teamjobot/graphql?branch=master) [![Join the chat at https://gitter.im/teamjobot/graphql](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/teamjobot/graphql?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 An implementation of GraphQL in Go. Follows the official reference implementation [`graphql-js`](https://github.com/graphql/graphql-js).
 
 Supports: queries, mutations & subscriptions.
 
 ### Documentation
 
-godoc: https://godoc.org/github.com/graphql-go/graphql
+godoc: https://pkg.go.dev/github.com/teamjobot/graphql
 
 ### Getting Started
 
 To install the library, run:
 ```bash
-go get github.com/graphql-go/graphql
+go get github.com/teamjobot/graphql
 ```
 
 The following is a simple example which defines a schema with a single `hello` string-type field and a `Resolve` method which returns the string `world`. A GraphQL query is performed against this schema with the resulting output printed in JSON format.
@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/graphql-go/graphql"
+	"github.com/teamjobot/graphql"
 )
 
 func main() {
@@ -60,13 +60,13 @@ func main() {
 	fmt.Printf("%s \n", rJSON) // {"data":{"hello":"world"}}
 }
 ```
-For more complex examples, refer to the [examples/](https://github.com/graphql-go/graphql/tree/master/examples/) directory and [graphql_test.go](https://github.com/graphql-go/graphql/blob/master/graphql_test.go).
+For more complex examples, refer to the [examples/](https://github.com/teamjobot/graphql/tree/master/examples/) directory and [graphql_test.go](https://github.com/teamjobot/graphql/blob/master/graphql_test.go).
 
 ### Third Party Libraries
 | Name          | Author        | Description  |
 |:-------------:|:-------------:|:------------:|
-| [graphql-go-handler](https://github.com/graphql-go/graphql-go-handler) | [Hafiz Ismail](https://github.com/sogko) | Middleware to handle GraphQL queries through HTTP requests. |
-| [graphql-relay-go](https://github.com/graphql-go/graphql-relay-go) | [Hafiz Ismail](https://github.com/sogko) | Lib to construct a graphql-go server supporting react-relay. |
+| [teamjobot-handler](https://github.com/teamjobot/teamjobot-handler) | [Hafiz Ismail](https://github.com/sogko) | Middleware to handle GraphQL queries through HTTP requests. |
+| [graphql-relay-go](https://github.com/teamjobot/graphql-relay-go) | [Hafiz Ismail](https://github.com/sogko) | Lib to construct a teamjobot server supporting react-relay. |
 | [golang-relay-starter-kit](https://github.com/sogko/golang-relay-starter-kit) | [Hafiz Ismail](https://github.com/sogko) | Barebones starting point for a Relay application with Golang GraphQL server. |
 | [dataloader](https://github.com/nicksrandall/dataloader) | [Nick Randall](https://github.com/nicksrandall) | [DataLoader](https://github.com/facebook/dataloader) implementation in Go. |
 

abstract_test.go

@@ -4,10 +4,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/graphql-go/graphql"
-	"github.com/graphql-go/graphql/gqlerrors"
-	"github.com/graphql-go/graphql/language/location"
-	"github.com/graphql-go/graphql/testutil"
+	"github.com/teamjobot/graphql"
+	"github.com/teamjobot/graphql/gqlerrors"
+	"github.com/teamjobot/graphql/language/location"
+	"github.com/teamjobot/graphql/testutil"
 )
 
 type testDog struct {

benchutil/list_schema.go

@@ -3,7 +3,7 @@ package benchutil
 import (
 	"fmt"
 
-	"github.com/graphql-go/graphql"
+	"github.com/teamjobot/graphql"
 )
 
 type color struct {

benchutil/wide_schema.go

@@ -3,7 +3,7 @@ package benchutil
 import (
 	"fmt"
 
-	"github.com/graphql-go/graphql"
+	"github.com/teamjobot/graphql"
 )
 
 func WideSchemaWithXFieldsAndYItems(x int, y int) graphql.Schema {

bind.go

@@ -0,0 +1,251 @@
+package graphql
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"reflect"
+)
+
+var ctxType = reflect.TypeOf((*context.Context)(nil)).Elem()
+var errType = reflect.TypeOf((*error)(nil)).Elem()
+
+/*
+	Bind will create a Field around a function formatted a certain way, or any value.
+
+	The input parameters can be, in any order,
+	- context.Context, or *context.Context (optional)
+	- An input struct, or pointer (optional)
+
+	The output parameters can be, in any order,
+	- A primitive, an output struct, or pointer (required for use in schema)
+	- error (optional)
+
+	Input or output types provided will be automatically bound using BindType.
+*/
+func Bind(bindTo interface{}, additionalFields ...Fields) *Field {
+	combinedAdditionalFields := MergeFields(additionalFields...)
+	val := reflect.ValueOf(bindTo)
+	tipe := reflect.TypeOf(bindTo)
+	if tipe.Kind() == reflect.Func {
+		in := tipe.NumIn()
+		out := tipe.NumOut()
+
+		var ctxIn *int
+		var inputIn *int
+
+		var errOut *int
+		var outputOut *int
+
+		queryArgs := FieldConfigArgument{}
+
+		if in > 2 {
+			panic(fmt.Sprintf("Mismatch on number of inputs. Expected 0, 1, or 2. got %d.", tipe.NumIn()))
+		}
+
+		if out > 2 {
+			panic(fmt.Sprintf("Mismatch on number of outputs. Expected 0, 1, or 2, got %d.", tipe.NumOut()))
+		}
+
+		// inTypes := make([]reflect.Type, in)
+		// outTypes := make([]reflect.Type, out)
+
+		for i := 0; i < in; i++ {
+			t := tipe.In(i)
+			if t.Kind() == reflect.Ptr {
+				t = t.Elem()
+			}
+			switch t {
+			case ctxType:
+				if ctxIn != nil {
+					panic(fmt.Sprintf("Unexpected multiple *context.Context inputs."))
+				}
+				ctxIn = intP(i)
+			default:
+				if inputIn != nil {
+					panic(fmt.Sprintf("Unexpected multiple inputs."))
+				}
+				inputType := tipe.In(i)
+				if inputType.Kind() == reflect.Ptr {
+					inputType = inputType.Elem()
+				}
+				inputFields := BindFields(reflect.New(inputType).Interface())
+				for key, inputField := range inputFields {
+					queryArgs[key] = &ArgumentConfig{
+						Type: inputField.Type,
+					}
+				}
+
+				inputIn = intP(i)
+			}
+		}
+
+		for i := 0; i < out; i++ {
+			t := tipe.Out(i)
+			switch t.String() {
+			case errType.String():
+				if errOut != nil {
+					panic(fmt.Sprintf("Unexpected multiple error outputs"))
+				}
+				errOut = intP(i)
+			default:
+				if outputOut != nil {
+					panic(fmt.Sprintf("Unexpected multiple outputs"))
+				}
+				outputOut = intP(i)
+			}
+		}
+
+		resolve := func(p ResolveParams) (output interface{}, err error) {
+			inputs := make([]reflect.Value, in)
+			if ctxIn != nil {
+				isPtr := tipe.In(*ctxIn).Kind() == reflect.Ptr
+				if isPtr {
+					if p.Context == nil {
+						inputs[*ctxIn] = reflect.New(ctxType)
+					} else {
+						inputs[*ctxIn] = reflect.ValueOf(&p.Context)
+					}
+				} else {
+					if p.Context == nil {
+						inputs[*ctxIn] = reflect.New(ctxType).Elem()
+					} else {
+						inputs[*ctxIn] = reflect.ValueOf(p.Context).Convert(ctxType).Elem()
+					}
+				}
+			}
+			if inputIn != nil {
+				var inputType, inputBaseType, sourceType, sourceBaseType reflect.Type
+				sourceVal := reflect.ValueOf(p.Source)
+				sourceExists := !sourceVal.IsZero()
+				if sourceExists {
+					sourceType = sourceVal.Type()
+					if sourceType.Kind() == reflect.Ptr {
+						sourceBaseType = sourceType.Elem()
+					} else {
+						sourceBaseType = sourceType
+					}
+				}
+				inputType = tipe.In(*inputIn)
+				isPtr := tipe.In(*inputIn).Kind() == reflect.Ptr
+				if isPtr {
+					inputBaseType = inputType.Elem()
+				} else {
+					inputBaseType = inputType
+				}
+				var input interface{}
+				if sourceExists && sourceBaseType.AssignableTo(inputBaseType) {
+					input = sourceVal.Interface()
+				} else {
+					input = reflect.New(inputBaseType).Interface()
+					j, err := json.Marshal(p.Args)
+					if err == nil {
+						err = json.Unmarshal(j, &input)
+					}
+					if err != nil {
+						return nil, err
+					}
+				}
+
+				inputs[*inputIn], err = convertValue(reflect.ValueOf(input), inputType)
+				if err != nil {
+					return nil, err
+				}
+			}
+			results := val.Call(inputs)
+			if errOut != nil {
+				val := results[*errOut].Interface()
+				if val != nil {
+					err = val.(error)
+				}
+				if err != nil {
+					return output, err
+				}
+			}
+			if outputOut != nil {
+				var val reflect.Value
+				val, err = convertValue(results[*outputOut], tipe.Out(*outputOut))
+				if err != nil {
+					return nil, err
+				}
+				if !val.IsZero() {
+					output = val.Interface()
+				}
+			}
+			return output, err
+		}
+
+		var outputType Output
+		if outputOut != nil {
+			outputType = BindType(tipe.Out(*outputOut))
+			extendType(outputType, combinedAdditionalFields)
+		}
+
+		field := &Field{
+			Type:    outputType,
+			Resolve: resolve,
+			Args:    queryArgs,
+		}
+
+		return field
+	} else if tipe.Kind() == reflect.Struct {
+		fieldType := BindType(reflect.TypeOf(bindTo))
+		extendType(fieldType, combinedAdditionalFields)
+		field := &Field{
+			Type: fieldType,
+			Resolve: func(p ResolveParams) (data interface{}, err error) {
+				return bindTo, nil
+			},
+		}
+		return field
+	} else {
+		if len(additionalFields) > 0 {
+			panic("Cannot add field resolvers to a scalar type.")
+		}
+		return &Field{
+			Type: getGraphType(tipe),
+			Resolve: func(p ResolveParams) (data interface{}, err error) {
+				return bindTo, nil
+			},
+		}
+	}
+}
+
+func extendType(t Type, fields Fields) {
+	switch t.(type) {
+	case *Object:
+		object := t.(*Object)
+		for fieldName, fieldConfig := range fields {
+			object.AddFieldConfig(fieldName, fieldConfig)
+		}
+		return
+	case *List:
+		list := t.(*List)
+		extendType(list.OfType, fields)
+		return
+	}
+}
+
+func convertValue(value reflect.Value, targetType reflect.Type) (ret reflect.Value, err error) {
+	if !value.IsValid() || value.IsZero() {
+		return reflect.Zero(targetType), nil
+	}
+	if value.Type().Kind() == reflect.Ptr {
+		if targetType.Kind() == reflect.Ptr {
+			return value, nil
+		} else {
+			return value.Elem(), nil
+		}
+	} else {
+		if targetType.Kind() == reflect.Ptr {
+			// Will throw an informative error
+			return value.Convert(targetType), nil
+		} else {
+			return value, nil
+		}
+	}
+}
+
+func intP(i int) *int {
+	return &i
+}