fix bug and delete String of Int and Float (#205)

* fix bug and delete String of Int and Float * fix bug and delete String of Int and Float * add string * add changes * change module name * change all module name * Add helper functions and short circuit to avoid performance regression Signed-off-by: Steve Coffman <[email protected]> Co-authored-by: Steve Coffman <[email protected]>
vektah · Apr 10, 2022 · 815d602 · 815d602
1 parent db38a01
commit 815d602
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/validator/vars.go b/validator/vars.go
@@ -3,6 +3,7 @@ package validator
 import (
 	"fmt"
 	"reflect"
+	"strconv"
 	"strings"
 
 	"github.com/vektah/gqlparser/v2/ast"
@@ -132,11 +133,11 @@ func (v *varValidator) validateVarType(typ *ast.Type, val reflect.Value) (reflec
 		kind := val.Type().Kind()
 		switch typ.NamedType {
 		case "Int":
-			if kind == reflect.String || kind == reflect.Int || kind == reflect.Int32 || kind == reflect.Int64 {
+			if kind == reflect.Int || kind == reflect.Int32 || kind == reflect.Int64 || kind == reflect.Float32 || kind == reflect.Float64 || IsValidIntString(val, kind) {
 				return val, nil
 			}
 		case "Float":
-			if kind == reflect.String || kind == reflect.Float32 || kind == reflect.Float64 || kind == reflect.Int || kind == reflect.Int32 || kind == reflect.Int64 {
+			if kind == reflect.Float32 || kind == reflect.Float64 || kind == reflect.Int || kind == reflect.Int32 || kind == reflect.Int64 || IsValidFloatString(val, kind) {
 				return val, nil
 			}
 		case "String":
@@ -218,3 +219,20 @@ func (v *varValidator) validateVarType(typ *ast.Type, val reflect.Value) (reflec
 	}
 	return val, nil
 }
+
+func IsValidIntString(val reflect.Value, kind reflect.Kind) bool {
+	if kind != reflect.String {
+		return false
+	}
+	_, e := strconv.ParseInt(fmt.Sprintf("%v", val.Interface()), 10, 64)
+
+	return e == nil
+}
+
+func IsValidFloatString(val reflect.Value, kind reflect.Kind) bool {
+	if kind != reflect.String {
+		return false
+	}
+	_, e := strconv.ParseFloat(fmt.Sprintf("%v", val.Interface()), 64)
+	return e == nil
+}