replace datatype.Kind() with Type()

datatype/builtin/any.go

@@ -9,9 +9,9 @@ import (
 // AnyDataType is what its name tells
 type AnyDataType struct{}
 
-// Kind returns the kind of data
+// Type returns the type of data
-func (AnyDataType) Kind() reflect.Kind {
+func (AnyDataType) Type() reflect.Type {
-	return reflect.Interface
+	return reflect.TypeOf(interface{}(nil))
 }
 
 // Build returns the validator

datatype/builtin/bool.go

@@ -9,9 +9,9 @@ import (
 // BoolDataType is what its name tells
 type BoolDataType struct{}
 
-// Kind returns the kind of data
+// Type returns the type of data
-func (BoolDataType) Kind() reflect.Kind {
+func (BoolDataType) Type() reflect.Type {
-	return reflect.Bool
+	return reflect.TypeOf(true)
 }
 
 // Build returns the validator

datatype/builtin/float.go

@@ -10,9 +10,9 @@ import (
 // FloatDataType is what its name tells
 type FloatDataType struct{}
 
-// Kind returns the kind of data
+// Type returns the type of data
-func (FloatDataType) Kind() reflect.Kind {
+func (FloatDataType) Type() reflect.Type {
-	return reflect.Float64
+	return reflect.TypeOf(float64(0))
 }
 
 // Build returns the validator

datatype/builtin/int.go

@@ -11,9 +11,9 @@ import (
 // IntDataType is what its name tells
 type IntDataType struct{}
 
-// Kind returns the kind of data
+// Type returns the type of data
-func (IntDataType) Kind() reflect.Kind {
+func (IntDataType) Type() reflect.Type {
-	return reflect.Int
+	return reflect.TypeOf(int(0))
 }
 
 // Build returns the validator

datatype/builtin/string.go

@@ -14,9 +14,9 @@ var variableLengthRegex = regexp.MustCompile(`^string\((\d+), ?(\d+)\)$`)
 // StringDataType is what its name tells
 type StringDataType struct{}
 
-// Kind returns the kind of data
+// Type returns the type of data
-func (StringDataType) Kind() reflect.Kind {
+func (StringDataType) Type() reflect.Type {
-	return reflect.String
+	return reflect.TypeOf(string(""))
 }
 
 // Build returns the validator.

datatype/builtin/uint.go

@@ -11,9 +11,9 @@ import (
 // UintDataType is what its name tells
 type UintDataType struct{}
 
-// Kind returns the kind of data
+// Type returns the type of data
-func (UintDataType) Kind() reflect.Kind {
+func (UintDataType) Type() reflect.Type {
-	return reflect.Uint
+	return reflect.TypeOf(uint(0))
 }
 
 // Build returns the validator

datatype/types.go

@@ -10,6 +10,6 @@ type Validator func(value interface{}) (cast interface{}, valid bool)
 // definition does not match this T ; the registry is passed for recursive datatypes (e.g. slices, structs, etc)
 // to be able to access other datatypes
 type T interface {
-	Kind() reflect.Kind
+	Type() reflect.Type
 	Build(typeDefinition string, registry ...T) Validator
 }

internal/config/service.go

@@ -238,7 +238,7 @@ func (svc *Service) validateInput(types []datatype.T) error {
 			param.Validator = dtype.Build(param.Type, types...)
 			if param.Validator != nil {
 				datatypeFound = true
-				param.Kind = dtype.Kind()
+				param.ExtractType = dtype.Type()
 				break
 			}
 		}

internal/config/types.go

@@ -27,7 +27,7 @@ type Service struct {
 	Scope       [][]string             `json:"scope"`
 	Description string                 `json:"info"`
 	Input       map[string]*Parameter  `json:"in"`
-	// Output      map[string]*Parameter `json:"out"`
+	Output      map[string]interface{} `json:"out"`
 
 	// references to url parameters
 	// format: '/uri/{param}'
@@ -46,8 +46,8 @@ type Parameter struct {
 	Description string `json:"info"`
 	Type        string `json:"type"`
 	Rename      string `json:"name,omitempty"`
-	// Kind of data the datatype returns
+	// ExtractType is the type of data the datatype returns
-	Kind reflect.Kind
+	ExtractType reflect.Type
 	// Optional is set to true when the type is prefixed with '?'
 	Optional bool