add extraTag directive (#1173)

99designs · Oct 11, 2021 · 393f755 · 393f755
1 parent fd1bd7c
commit 393f755
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/codegen/config/config.go b/codegen/config/config.go
@@ -231,6 +231,10 @@ func (c *Config) injectTypesFromSchema() error {
 		SkipRuntime: true,
 	}
 
+	c.Directives["extraTag"] = DirectiveConfig{
+		SkipRuntime: true,
+	}
+
 	for _, schemaType := range c.Schema.Types {
 		if schemaType == c.Schema.Query || schemaType == c.Schema.Mutation || schemaType == c.Schema.Subscription {
 			continue
@@ -253,9 +257,15 @@ func (c *Config) injectTypesFromSchema() error {
 
 		if schemaType.Kind == ast.Object || schemaType.Kind == ast.InputObject {
 			for _, field := range schemaType.Fields {
+				typeMapField := TypeMapField{
+					ExtraTag:  c.Models[schemaType.Name].Fields[field.Name].ExtraTag,
+					FieldName: c.Models[schemaType.Name].Fields[field.Name].FieldName,
+					Resolver:  c.Models[schemaType.Name].Fields[field.Name].Resolver,
+				}
+				directive := false
 				if fd := field.Directives.ForName("goField"); fd != nil {
-					forceResolver := c.Models[schemaType.Name].Fields[field.Name].Resolver
-					fieldName := c.Models[schemaType.Name].Fields[field.Name].FieldName
+					forceResolver := typeMapField.Resolver
+					fieldName := typeMapField.FieldName
 
 					if ra := fd.Arguments.ForName("forceResolver"); ra != nil {
 						if fr, err := ra.Value.Value(nil); err == nil {
@@ -269,17 +279,28 @@ func (c *Config) injectTypesFromSchema() error {
 						}
 					}
 
+					typeMapField.FieldName = fieldName
+					typeMapField.Resolver = forceResolver
+					directive = true
+				}
+
+				if ex := field.Directives.ForName("extraTag"); ex != nil {
+					args := []string{}
+					for _, arg := range ex.Arguments {
+						args = append(args, arg.Name+`:"`+arg.Value.Raw+`"`)
+					}
+					typeMapField.ExtraTag = strings.Join(args, " ")
+					directive = true
+				}
+
+				if directive {
 					if c.Models[schemaType.Name].Fields == nil {
 						c.Models[schemaType.Name] = TypeMapEntry{
 							Model:  c.Models[schemaType.Name].Model,
 							Fields: map[string]TypeMapField{},
 						}
 					}
-
-					c.Models[schemaType.Name].Fields[field.Name] = TypeMapField{
-						FieldName: fieldName,
-						Resolver:  forceResolver,
-					}
+					c.Models[schemaType.Name].Fields[field.Name] = typeMapField
 				}
 			}
 		}
@@ -296,6 +317,7 @@ type TypeMapEntry struct {
 type TypeMapField struct {
 	Resolver        bool   `yaml:"resolver"`
 	FieldName       string `yaml:"fieldName"`
+	ExtraTag        string `yaml:"extraTag"`
 	GeneratedMethod string `yaml:"-"`
 }
 

diff --git a/docs/content/config.md b/docs/content/config.md
@@ -89,6 +89,9 @@ directive @goModel(model: String, models: [String!]) on OBJECT
 
 directive @goField(forceResolver: Boolean, name: String) on INPUT_FIELD_DEFINITION
     | FIELD_DEFINITION
+
+directive @extraTag on INPUT_FIELD_DEFINITION
+    | FIELD_DEFINITION
 ```
 
 > Here be dragons
@@ -101,6 +104,6 @@ Now you can use these directives when defining types in your schema:
 ```graphql
 type User @goModel(model: "github.com/my/app/models.User") {
     id: ID!         @goField(name: "todoId")
-    name: String!   @goField(forceResolver: true)
+    name: String!   @goField(forceResolver: true) @extraTag(xorm: "-")
 }
 ```
diff --git a/plugin/modelgen/models.go b/plugin/modelgen/models.go
@@ -162,11 +162,16 @@ func (m *Plugin) MutateConfig(cfg *config.Config) error {
 					typ = types.NewPointer(typ)
 				}
 
+				tag := `json:"` + field.Name + `"`
+				if extraTag := cfg.Models[schemaType.Name].Fields[field.Name].ExtraTag; extraTag != "" {
+					tag = tag + " " + extraTag
+				}
+
 				it.Fields = append(it.Fields, &Field{
 					Name:        name,
 					Type:        typ,
 					Description: field.Description,
-					Tag:         `json:"` + field.Name + `"`,
+					Tag:         tag,
 				})
 			}