trying to get description with generated models

99designs · Aug 26, 2018 · 6ae8238 · 6ae8238
1 parent 2dcb2dd
commit 6ae8238
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/codegen/enum.go b/codegen/enum.go
@@ -2,8 +2,8 @@ package codegen
 
 type Enum struct {
 	*NamedType
-
-	Values []EnumValue
+	Description string
+	Values      []EnumValue
 }
 
 type EnumValue struct {

diff --git a/codegen/enum_build.go b/codegen/enum_build.go
@@ -23,8 +23,9 @@ func (cfg *Config) buildEnums(types NamedTypes) []Enum {
 		}
 
 		enum := Enum{
-			NamedType: namedType,
-			Values:    values,
+			NamedType:   namedType,
+			Values:      values,
+			Description: typ.Description,
 		}
 		enum.GoType = templates.ToCamel(enum.GQLType)
 		enums = append(enums, enum)

diff --git a/codegen/model.go b/codegen/model.go
@@ -2,8 +2,8 @@ package codegen
 
 type Model struct {
 	*NamedType
-
-	Fields []ModelField
+	Description string
+	Fields      []ModelField
 }
 
 type ModelField struct {
@@ -12,4 +12,5 @@ type ModelField struct {
 	GoFieldName string
 	GoFKName    string
 	GoFKType    string
+	Description string
 }
diff --git a/codegen/models_build.go b/codegen/models_build.go
@@ -41,6 +41,7 @@ func (cfg *Config) buildModels(types NamedTypes, prog *loader.Program, imports *
 		default:
 			continue
 		}
+		model.Description = typ.Description // It's this or change both obj2Model and buildObject
 
 		models = append(models, model)
 	}

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/models.gotpl b/codegen/templates/models.gotpl
@@ -1,4 +1,5 @@
 // Code generated by github.com/99designs/gqlgen, DO NOT EDIT.
+// Dirt
 
 package {{ .PackageName }}
 
@@ -9,10 +10,13 @@ import (
 )
 
 {{ range $model := .Models }}
+	{{with .Description}} {{.|prefixLines "// "}} {{end}}
+
 	{{- if .IsInterface }}
 		type {{.GoType}} interface {}
 	{{- else }}
 		type {{.GoType}} struct {
+
 			{{- range $field := .Fields }}
 				{{- if $field.GoFieldName }}
 					{{ $field.GoFieldName }} {{$field.Signature}} `json:"{{$field.GQLName}}"`
@@ -25,12 +29,13 @@ import (
 {{- end}}
 
 {{ range $enum := .Enums }}
+	{{with .Description}} {{.|prefixLines "// "}} {{end}}
 	type {{.GoType}} string
 	const (
-	{{ range $value := .Values -}}
+	{{ range $value := .Values}}
 		{{with .Description}} {{.|prefixLines "// "}} {{end}}
 		{{$enum.GoType}}{{ .Name|toCamel }} {{$enum.GoType}} = {{.Name|quote}}
-	{{- end }}
+	{{ end }}
 	)
 
 	func (e {{.GoType}}) IsValid() bool {