Merge branch 'master' of https://github.com/graphql-go/graphql into util

Author: jekiapp

README.md

@@ -62,7 +62,7 @@ For more complex examples, refer to the [examples/](https://github.com/graphql-g
 
 ### Origin and Current Direction
 
-This project was originally a port of [v0.4.3](https://github.com/graphql/graphql-js/releases/tag/v0.4.3) of [graphql-js](https://github.com/graphql/graphql-js) (excluding the Validator), which was based on the July 2015 GraphQL specification. `graphql` is currently several versions behind `graphql-js`, however future efforts will be guided directly by the [latest formal GraphQL specification](https://github.com/facebook/graphql/releases) (currently: [October 2015](https://github.com/facebook/graphql/releases/tag/October2015)).
+This project was originally a port of [v0.4.3](https://github.com/graphql/graphql-js/releases/tag/v0.4.3) of [graphql-js](https://github.com/graphql/graphql-js) (excluding the Validator), which was based on the July 2015 GraphQL specification. `graphql-go` is currently on [v0.6.0](https://github.com/graphql/graphql-js/releases/tag/v0.6.0) of `graphql-js` which is based on the [April 2016](https://github.com/facebook/graphql/releases/tag/April2016) GraphQL specification. However future efforts will be guided directly by the [latest formal GraphQL specification](https://github.com/facebook/graphql/releases) (currently: [October 2016](https://github.com/facebook/graphql/releases/tag/October2016)).
 
 ### Third Party Libraries
 | Name          | Author        | Description  |

scalars.go

@@ -25,52 +25,78 @@ func coerceInt(value interface{}) interface{} {
 			return nil
 		}
 		return value
+	case *int:
+		return coerceInt(*value)
 	case int8:
 		return int(value)
+	case *int8:
+		return int(*value)
 	case int16:
 		return int(value)
+	case *int16:
+		return int(*value)
 	case int32:
 		return int(value)
+	case *int32:
+		return int(*value)
 	case int64:
 		if value < int64(math.MinInt32) || value > int64(math.MaxInt32) {
 			return nil
 		}
 		return int(value)
+	case *int64:
+		return coerceInt(*value)
 	case uint:
 		if value > math.MaxInt32 {
 			return nil
 		}
 		return int(value)
+	case *uint:
+		return coerceInt(*value)
 	case uint8:
 		return int(value)
+	case *uint8:
+		return int(*value)
 	case uint16:
 		return int(value)
+	case *uint16:
+		return int(*value)
 	case uint32:
 		if value > uint32(math.MaxInt32) {
 			return nil
 		}
 		return int(value)
+	case *uint32:
+		return coerceInt(*value)
 	case uint64:
 		if value > uint64(math.MaxInt32) {
 			return nil
 		}
 		return int(value)
+	case *uint64:
+		return coerceInt(*value)
 	case float32:
 		if value < float32(math.MinInt32) || value > float32(math.MaxInt32) {
 			return nil
 		}
 		return int(value)
+	case *float32:
+		return coerceInt(*value)
 	case float64:
 		if value < float64(math.MinInt32) || value > float64(math.MaxInt32) {
 			return nil
 		}
 		return int(value)
+	case *float64:
+		return coerceInt(*value)
 	case string:
 		val, err := strconv.ParseFloat(value, 0)
 		if err != nil {
 			return nil
 		}
 		return coerceInt(val)
+	case *string:
+		return coerceInt(*value)
 	}
 
 	// If the value cannot be transformed into an int, return nil instead of '0'
@@ -103,18 +129,28 @@ func coerceFloat(value interface{}) interface{} {
 			return 1.0
 		}
 		return 0.0
+	case *bool:
+		return coerceFloat(*value)
 	case int:
 		return float64(value)
+	case *int32:
+		return coerceFloat(*value)
 	case float32:
 		return value
+	case *float32:
+		return coerceFloat(*value)
 	case float64:
 		return value
+	case *float64:
+		return coerceFloat(*value)
 	case string:
 		val, err := strconv.ParseFloat(value, 0)
 		if err != nil {
 			return nil
 		}
 		return val
+	case *string:
+		return coerceFloat(*value)
 	}
 	return 0.0
 }
@@ -143,6 +179,9 @@ var Float = NewScalar(ScalarConfig{
 })
 
 func coerceString(value interface{}) interface{} {
+	if v, ok := value.(*string); ok {
+		return *v
+	}
 	return fmt.Sprintf("%v", value)
 }
 
@@ -167,27 +206,37 @@ func coerceBool(value interface{}) interface{} {
 	switch value := value.(type) {
 	case bool:
 		return value
+	case *bool:
+		return *value
 	case string:
 		switch value {
 		case "", "false":
 			return false
 		}
 		return true
+	case *string:
+		return coerceBool(*value)
 	case float64:
 		if value != 0 {
 			return true
 		}
 		return false
+	case *float64:
+		return coerceBool(*value)
 	case float32:
 		if value != 0 {
 			return true
 		}
 		return false
+	case *float32:
+		return coerceBool(*value)
 	case int:
 		if value != 0 {
 			return true
 		}
 		return false
+	case *int:
+		return coerceBool(*value)
 	}
 	return false
 }

values.go

@@ -320,15 +320,39 @@ func isNullish(value interface{}) bool {
 	if value, ok := value.(string); ok {
 		return value == ""
 	}
+	if value, ok := value.(*string); ok {
+		if value == nil {
+			return true
+		}
+		return *value == ""
+	}
 	if value, ok := value.(int); ok {
 		return math.IsNaN(float64(value))
 	}
+	if value, ok := value.(*int); ok {
+		if value == nil {
+			return true
+		}
+		return math.IsNaN(float64(*value))
+	}
 	if value, ok := value.(float32); ok {
 		return math.IsNaN(float64(value))
 	}
+	if value, ok := value.(*float32); ok {
+		if value == nil {
+			return true
+		}
+		return math.IsNaN(float64(*value))
+	}
 	if value, ok := value.(float64); ok {
 		return math.IsNaN(value)
 	}
+	if value, ok := value.(*float64); ok {
+		if value == nil {
+			return true
+		}
+		return math.IsNaN(*value)
+	}
 	return value == nil
 }