Merge pull request #37 from vektah/generate-interfaces

generate interfaces

codegen/build.go

@@ -25,7 +25,7 @@ type Build struct {
 type ModelBuild struct {
 	PackageName string
 	Imports     Imports
-	Models      Objects
+	Models      []Model
 }
 
 // Create a list of models that need to be generated

codegen/input_build.go

@@ -40,7 +40,7 @@ func buildInputs(namedTypes NamedTypes, s *schema.Schema, prog *loader.Program,
 }
 
 func buildInput(types NamedTypes, typ *schema.InputObject) *Object {
-	obj := &Object{NamedType: types[typ.TypeName()], Input: true}
+	obj := &Object{NamedType: types[typ.TypeName()]}
 
 	for _, field := range typ.Values {
 		obj.Fields = append(obj.Fields, Field{

codegen/interface_build.go

@@ -1,6 +1,7 @@
 package codegen
 
 import (
+	"fmt"
 	"sort"
 	"strings"
 
@@ -11,24 +12,10 @@ func buildInterfaces(types NamedTypes, s *schema.Schema) []*Interface {
 	var interfaces []*Interface
 	for _, typ := range s.Types {
 		switch typ := typ.(type) {
-
-		case *schema.Union:
-			i := &Interface{NamedType: types[typ.TypeName()]}
-
-			for _, implementor := range typ.PossibleTypes {
-				i.Implementors = append(i.Implementors, types[implementor.TypeName()])
-			}
-
-			interfaces = append(interfaces, i)
-
-		case *schema.Interface:
-			i := &Interface{NamedType: types[typ.TypeName()]}
-
-			for _, implementor := range typ.PossibleTypes {
-				i.Implementors = append(i.Implementors, types[implementor.TypeName()])
-			}
-
-			interfaces = append(interfaces, i)
+		case *schema.Union, *schema.Interface:
+			interfaces = append(interfaces, buildInterface(types, typ))
+		default:
+			continue
 		}
 	}
 
@@ -38,3 +25,28 @@ func buildInterfaces(types NamedTypes, s *schema.Schema) []*Interface {
 
 	return interfaces
 }
+
+func buildInterface(types NamedTypes, typ schema.NamedType) *Interface {
+	switch typ := typ.(type) {
+
+	case *schema.Union:
+		i := &Interface{NamedType: types[typ.TypeName()]}
+
+		for _, implementor := range typ.PossibleTypes {
+			i.Implementors = append(i.Implementors, types[implementor.TypeName()])
+		}
+
+		return i
+
+	case *schema.Interface:
+		i := &Interface{NamedType: types[typ.TypeName()]}
+
+		for _, implementor := range typ.PossibleTypes {
+			i.Implementors = append(i.Implementors, types[implementor.TypeName()])
+		}
+
+		return i
+	default:
+		panic(fmt.Errorf("unknown interface %#v", typ))
+	}
+}

codegen/model.go

@@ -0,0 +1,15 @@
+package codegen
+
+type Model struct {
+	*NamedType
+
+	Fields []ModelField
+}
+
+type ModelField struct {
+	*Type
+
+	GoVarName string
+	GoFKName  string
+	GoFKType  string
+}

codegen/models_build.go

@@ -7,25 +7,34 @@ import (
 	"github.com/vektah/gqlgen/neelance/schema"
 )
 
-func buildModels(types NamedTypes, s *schema.Schema) Objects {
-	var models Objects
+func buildModels(types NamedTypes, s *schema.Schema) []Model {
+	var models []Model
 
 	for _, typ := range s.Types {
-		var model *Object
+		var model Model
 		switch typ := typ.(type) {
 		case *schema.Object:
-			model = buildObject(types, typ, s)
-
+			obj := buildObject(types, typ, s)
+			if obj.Root || obj.GoType != "" {
+				continue
+			}
+			model = obj2Model(obj)
 		case *schema.InputObject:
-			model = buildInput(types, typ)
-		}
-
-		if model == nil || model.Root || model.GoType != "" {
+			obj := buildInput(types, typ)
+			if obj.GoType != "" {
+				continue
+			}
+			model = obj2Model(obj)
+		case *schema.Interface, *schema.Union:
+			intf := buildInterface(types, typ)
+			if intf.GoType != "" {
+				continue
+			}
+			model = int2Model(intf)
+		default:
 			continue
 		}
 
-		bindGenerated(types, model)
-
 		models = append(models, model)
 	}
 
@@ -36,23 +45,45 @@ func buildModels(types NamedTypes, s *schema.Schema) Objects {
 	return models
 }
 
-func bindGenerated(types NamedTypes, object *Object) {
-	object.GoType = ucFirst(object.GQLType)
-	object.Marshaler = &Ref{GoType: object.GoType}
+func obj2Model(obj *Object) Model {
+	model := Model{
+		NamedType: obj.NamedType,
+		Fields:    []ModelField{},
+	}
+
+	model.GoType = ucFirst(obj.GQLType)
+	model.Marshaler = &Ref{GoType: obj.GoType}
 
-	for i := range object.Fields {
-		field := &object.Fields[i]
+	for i := range obj.Fields {
+		field := &obj.Fields[i]
+		mf := ModelField{Type: field.Type}
 
-		if field.IsScalar {
-			field.GoVarName = ucFirst(field.GQLName)
-			if field.GoVarName == "Id" {
-				field.GoVarName = "ID"
+		if mf.IsScalar {
+			mf.GoVarName = ucFirst(field.GQLName)
+			if mf.GoVarName == "Id" {
+				mf.GoVarName = "ID"
 			}
-		} else if object.Input {
-			field.GoVarName = ucFirst(field.GQLName)
+		} else if mf.IsInput {
+			mf.GoVarName = ucFirst(field.GQLName)
 		} else {
-			field.GoFKName = ucFirst(field.GQLName) + "ID"
-			field.GoFKType = "int" // todo: use schema to determine type of id?
+			mf.GoFKName = ucFirst(field.GQLName) + "ID"
+			mf.GoFKType = "int" // todo: use schema to determine type of id?
 		}
+
+		model.Fields = append(model.Fields, mf)
+	}
+
+	return model
+}
+
+func int2Model(obj *Interface) Model {
+	model := Model{
+		NamedType: obj.NamedType,
+		Fields:    []ModelField{},
 	}
+
+	model.GoType = ucFirst(obj.GQLType)
+	model.Marshaler = &Ref{GoType: obj.GoType}
+
+	return model
 }

codegen/object.go

@@ -17,7 +17,6 @@ type Object struct {
 	Root               bool
 	DisableConcurrency bool
 	Stream             bool
-	Input              bool
 }
 
 type Field struct {
@@ -26,8 +25,6 @@ type Field struct {
 	GQLName      string          // The name of the field in graphql
 	GoMethodName string          // The name of the method in go, if any
 	GoVarName    string          // The name of the var in go, if any
-	GoFKName     string          // The name of the FK used when generating models
-	GoFKType     string          // The type of the FK used when generating models
 	Args         []FieldArgument // A list of arguments to be passed to this field
 	NoErr        bool            // If this is bound to a go method, does that method have an error as the second argument
 	Object       *Object         // A link back to the parent object

codegen/templates/models.gotpl

@@ -9,13 +9,17 @@ import (
 )
 
 {{ range $model := .Models }}
-	type {{.GoType}} struct {
-		{{- range $field := .Fields }}
-			{{- if $field.GoVarName }}
-				{{ $field.GoVarName }} {{$field.Signature}}
-			{{- else }}
-				{{ $field.GoFKName }} {{$field.GoFKType}}
+	{{- if .IsInterface }}
+		type {{.GoType}} interface {}
+	{{- else }}
+		type {{.GoType}} struct {
+			{{- range $field := .Fields }}
+				{{- if $field.GoVarName }}
+					{{ $field.GoVarName }} {{$field.Signature}}
+				{{- else }}
+					{{ $field.GoFKName }} {{$field.GoFKType}}
+				{{- end }}
 			{{- end }}
-		{{- end }}
-	}
+		}
+	{{- end }}
 {{- end}}

codegen/type.go

@@ -11,6 +11,7 @@ type NamedType struct {
 	Ref
 	IsScalar    bool
 	IsInterface bool
+	IsInput     bool
 	GQLType     string // Name of the graphql type
 	Marshaler   *Ref   // If this type has an external marshaler this will be set
 }

codegen/type_build.go

@@ -57,6 +57,8 @@ func namedTypeFromSchema(schemaType schema.NamedType) *NamedType {
 		return &NamedType{GQLType: val.TypeName(), IsScalar: true}
 	case *schema.Interface, *schema.Union:
 		return &NamedType{GQLType: val.TypeName(), IsInterface: true}
+	case *schema.InputObject:
+		return &NamedType{GQLType: val.TypeName(), IsInput: true}
 	default:
 		return &NamedType{GQLType: val.TypeName()}
 	}