Add getter methods to all fields, not just where needed (#126)
## Summary: If your type implements an interface, we add getter methods for the shared fields, so that those may be accessed via the interface. But it turns out occasionally it's useful to have these getter methods when they don't implement a GraphQL interface, so you can use two genqlient-generated types in the same function if they have the same fields. (This comes up most often when you have a GraphQL union that maybe should really be an interface, or if you don't yet support interfaces implementing other interfaces (indeed our parser doesn't either). But one can imagine other use cases.) We can't predict how you want to do that, so we can't generate the interface, but we can generate the methods, so you can define the interface and do a type assertion from there. Since these methods are pretty simple to generate, we just do it always. (As with #120, if binary size becomes an issue we could later add an option to only generate methods that are truly needed but including them seems like the better default.) This also fixes a subtle and rare bug, which would have become much more common (indeed existing tests caught it). Specifically, if you have a query like ```graphql fragment FragmentOne on T { id } fragment FragmentTwo on T { id } query Q { f { # interface type T ...FragmentOne ...FragmentTwo } } ``` since both `FragmentOne` and `FragmentTwo` request some common field, say `id`, we generate a method `GetId` on each one. But since `FragmentOne` and `FragmentTwo` are both on `T`, we also include their interfaces in the interface we generate for the type of `f`, `QFT`. So `QFT` includes a method `GetId`. But on the implementations, the two methods conflict, and neither gets promoted; this causes various code to fail to compile. With this change, this would have happened much more frequently -- even if only one of the two fragments is on `T`, as long as both request the field. Anyway, we now generate explicit methods on each struct for all of its recursively emebedded fields -- using the logic from #120 to compute them -- so that we don't need to rely on method-promotion. ## Test plan: make tesc Author: benjaminjkraft Reviewers: csilvers, dnerdy, aberkan, jvoll, mahtabsabet, MiguelCastillo, StevenACoffman Required Reviewers: Approved By: csilvers, dnerdy Checks: ✅ Test (1.17), ✅ Test (1.16), ✅ Test (1.15), ✅ Test (1.14), ✅ Lint, ✅ Test (1.17), ✅ Test (1.16), ✅ Test (1.15), ✅ Test (1.14), ✅ Lint Pull Request URL: https://github.com/Khan/genqlient/pull/126
This commit is contained in:
+89
-32
@@ -34,6 +34,12 @@ type StructOptionResponse struct {
|
||||
User StructOptionUser `json:"user"`
|
||||
}
|
||||
|
||||
// GetRoot returns StructOptionResponse.Root, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionResponse) GetRoot() StructOptionRootTopic { return v.Root }
|
||||
|
||||
// GetUser returns StructOptionResponse.User, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionResponse) GetUser() StructOptionUser { return v.User }
|
||||
|
||||
// StructOptionRootTopic includes the requested fields of the GraphQL type Topic.
|
||||
type StructOptionRootTopic struct {
|
||||
// ID is documented in the Content interface.
|
||||
@@ -41,6 +47,14 @@ type StructOptionRootTopic struct {
|
||||
Children []StructOptionRootTopicChildrenContent `json:"children"`
|
||||
}
|
||||
|
||||
// GetId returns StructOptionRootTopic.Id, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopic) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetChildren returns StructOptionRootTopic.Children, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopic) GetChildren() []StructOptionRootTopicChildrenContent {
|
||||
return v.Children
|
||||
}
|
||||
|
||||
// StructOptionRootTopicChildrenContent includes the requested fields of the GraphQL type Content.
|
||||
// The GraphQL type's documentation follows.
|
||||
//
|
||||
@@ -52,6 +66,17 @@ type StructOptionRootTopicChildrenContent struct {
|
||||
Parent StructOptionRootTopicChildrenContentParentTopic `json:"parent"`
|
||||
}
|
||||
|
||||
// GetTypename returns StructOptionRootTopicChildrenContent.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContent) GetTypename() string { return v.Typename }
|
||||
|
||||
// GetId returns StructOptionRootTopicChildrenContent.Id, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContent) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetParent returns StructOptionRootTopicChildrenContent.Parent, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContent) GetParent() StructOptionRootTopicChildrenContentParentTopic {
|
||||
return v.Parent
|
||||
}
|
||||
|
||||
// StructOptionRootTopicChildrenContentParentTopic includes the requested fields of the GraphQL type Topic.
|
||||
type StructOptionRootTopicChildrenContentParentTopic struct {
|
||||
// ID is documented in the Content interface.
|
||||
@@ -60,6 +85,19 @@ type StructOptionRootTopicChildrenContentParentTopic struct {
|
||||
InterfaceChildren []StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent `json:"-"`
|
||||
}
|
||||
|
||||
// GetId returns StructOptionRootTopicChildrenContentParentTopic.Id, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopic) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetChildren returns StructOptionRootTopicChildrenContentParentTopic.Children, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopic) GetChildren() []StructOptionRootTopicChildrenContentParentTopicChildrenContent {
|
||||
return v.Children
|
||||
}
|
||||
|
||||
// GetInterfaceChildren returns StructOptionRootTopicChildrenContentParentTopic.InterfaceChildren, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopic) GetInterfaceChildren() []StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent {
|
||||
return v.InterfaceChildren
|
||||
}
|
||||
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopic) UnmarshalJSON(b []byte) error {
|
||||
|
||||
if string(b) == "null" {
|
||||
@@ -151,6 +189,16 @@ type StructOptionRootTopicChildrenContentParentTopicChildrenContent struct {
|
||||
Id testutil.ID `json:"id"`
|
||||
}
|
||||
|
||||
// GetTypename returns StructOptionRootTopicChildrenContentParentTopicChildrenContent.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicChildrenContent) GetTypename() string {
|
||||
return v.Typename
|
||||
}
|
||||
|
||||
// GetId returns StructOptionRootTopicChildrenContentParentTopicChildrenContent.Id, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicChildrenContent) GetId() testutil.ID {
|
||||
return v.Id
|
||||
}
|
||||
|
||||
// StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle includes the requested fields of the GraphQL type Article.
|
||||
type StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle struct {
|
||||
Typename string `json:"__typename"`
|
||||
@@ -158,6 +206,16 @@ type StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle str
|
||||
Id testutil.ID `json:"id"`
|
||||
}
|
||||
|
||||
// GetTypename returns StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle) GetTypename() string {
|
||||
return v.Typename
|
||||
}
|
||||
|
||||
// GetId returns StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle.Id, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle) GetId() testutil.ID {
|
||||
return v.Id
|
||||
}
|
||||
|
||||
// StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent includes the requested fields of the GraphQL interface Content.
|
||||
//
|
||||
// StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent is implemented by the following types:
|
||||
@@ -180,43 +238,11 @@ type StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent int
|
||||
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle) implementsGraphQLInterfaceStructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent() {
|
||||
}
|
||||
|
||||
// GetTypename is a part of, and documented with, the interface StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle) GetTypename() string {
|
||||
return v.Typename
|
||||
}
|
||||
|
||||
// GetId is a part of, and documented with, the interface StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenArticle) GetId() testutil.ID {
|
||||
return v.Id
|
||||
}
|
||||
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo) implementsGraphQLInterfaceStructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent() {
|
||||
}
|
||||
|
||||
// GetTypename is a part of, and documented with, the interface StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo) GetTypename() string {
|
||||
return v.Typename
|
||||
}
|
||||
|
||||
// GetId is a part of, and documented with, the interface StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo) GetId() testutil.ID {
|
||||
return v.Id
|
||||
}
|
||||
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenTopic) implementsGraphQLInterfaceStructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent() {
|
||||
}
|
||||
|
||||
// GetTypename is a part of, and documented with, the interface StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenTopic) GetTypename() string {
|
||||
return v.Typename
|
||||
}
|
||||
|
||||
// GetId is a part of, and documented with, the interface StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenTopic) GetId() testutil.ID {
|
||||
return v.Id
|
||||
}
|
||||
|
||||
func __unmarshalStructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent(b []byte, v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenContent) error {
|
||||
if string(b) == "null" {
|
||||
return nil
|
||||
@@ -296,6 +322,16 @@ type StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenTopic struc
|
||||
Id testutil.ID `json:"id"`
|
||||
}
|
||||
|
||||
// GetTypename returns StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenTopic.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenTopic) GetTypename() string {
|
||||
return v.Typename
|
||||
}
|
||||
|
||||
// GetId returns StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenTopic.Id, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenTopic) GetId() testutil.ID {
|
||||
return v.Id
|
||||
}
|
||||
|
||||
// StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo includes the requested fields of the GraphQL type Video.
|
||||
type StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo struct {
|
||||
Typename string `json:"__typename"`
|
||||
@@ -304,6 +340,21 @@ type StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo struc
|
||||
VideoFields `json:"-"`
|
||||
}
|
||||
|
||||
// GetTypename returns StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo) GetTypename() string {
|
||||
return v.Typename
|
||||
}
|
||||
|
||||
// GetId returns StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo.Id, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo) GetId() testutil.ID {
|
||||
return v.Id
|
||||
}
|
||||
|
||||
// GetDuration returns StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo.Duration, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo) GetDuration() int {
|
||||
return v.VideoFields.Duration
|
||||
}
|
||||
|
||||
func (v *StructOptionRootTopicChildrenContentParentTopicInterfaceChildrenVideo) UnmarshalJSON(b []byte) error {
|
||||
|
||||
if string(b) == "null" {
|
||||
@@ -362,11 +413,17 @@ type StructOptionUser struct {
|
||||
Roles []Role `json:"roles"`
|
||||
}
|
||||
|
||||
// GetRoles returns StructOptionUser.Roles, and is useful for accessing the field via an interface.
|
||||
func (v *StructOptionUser) GetRoles() []Role { return v.Roles }
|
||||
|
||||
// VideoFields includes the GraphQL fields of Video requested by the fragment VideoFields.
|
||||
type VideoFields struct {
|
||||
Duration int `json:"duration"`
|
||||
}
|
||||
|
||||
// GetDuration returns VideoFields.Duration, and is useful for accessing the field via an interface.
|
||||
func (v *VideoFields) GetDuration() int { return v.Duration }
|
||||
|
||||
func StructOption(
|
||||
client graphql.Client,
|
||||
) (*StructOptionResponse, error) {
|
||||
|
||||
Reference in New Issue
Block a user