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:
Vendored
+89
-36
@@ -18,6 +18,15 @@ type SimpleNamedFragmentRandomItemArticle struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
// GetTypename returns SimpleNamedFragmentRandomItemArticle.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemArticle) GetTypename() string { return v.Typename }
|
||||
|
||||
// GetId returns SimpleNamedFragmentRandomItemArticle.Id, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemArticle) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetName returns SimpleNamedFragmentRandomItemArticle.Name, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemArticle) GetName() string { return v.Name }
|
||||
|
||||
// SimpleNamedFragmentRandomItemContent includes the requested fields of the GraphQL interface Content.
|
||||
//
|
||||
// SimpleNamedFragmentRandomItemContent is implemented by the following types:
|
||||
@@ -42,40 +51,11 @@ type SimpleNamedFragmentRandomItemContent interface {
|
||||
|
||||
func (v *SimpleNamedFragmentRandomItemArticle) implementsGraphQLInterfaceSimpleNamedFragmentRandomItemContent() {
|
||||
}
|
||||
|
||||
// GetTypename is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemArticle) GetTypename() string { return v.Typename }
|
||||
|
||||
// GetId is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemArticle) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetName is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemArticle) GetName() string { return v.Name }
|
||||
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) implementsGraphQLInterfaceSimpleNamedFragmentRandomItemContent() {
|
||||
}
|
||||
|
||||
// GetTypename is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetTypename() string { return v.Typename }
|
||||
|
||||
// GetId is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetName is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetName() string { return v.Name }
|
||||
|
||||
func (v *SimpleNamedFragmentRandomItemTopic) implementsGraphQLInterfaceSimpleNamedFragmentRandomItemContent() {
|
||||
}
|
||||
|
||||
// GetTypename is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemTopic) GetTypename() string { return v.Typename }
|
||||
|
||||
// GetId is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemTopic) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetName is a part of, and documented with, the interface SimpleNamedFragmentRandomItemContent.
|
||||
func (v *SimpleNamedFragmentRandomItemTopic) GetName() string { return v.Name }
|
||||
|
||||
func __unmarshalSimpleNamedFragmentRandomItemContent(b []byte, v *SimpleNamedFragmentRandomItemContent) error {
|
||||
if string(b) == "null" {
|
||||
return nil
|
||||
@@ -156,6 +136,15 @@ type SimpleNamedFragmentRandomItemTopic struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
// GetTypename returns SimpleNamedFragmentRandomItemTopic.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemTopic) GetTypename() string { return v.Typename }
|
||||
|
||||
// GetId returns SimpleNamedFragmentRandomItemTopic.Id, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemTopic) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetName returns SimpleNamedFragmentRandomItemTopic.Name, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemTopic) GetName() string { return v.Name }
|
||||
|
||||
// SimpleNamedFragmentRandomItemVideo includes the requested fields of the GraphQL type Video.
|
||||
type SimpleNamedFragmentRandomItemVideo struct {
|
||||
Typename string `json:"__typename"`
|
||||
@@ -165,6 +154,26 @@ type SimpleNamedFragmentRandomItemVideo struct {
|
||||
VideoFields `json:"-"`
|
||||
}
|
||||
|
||||
// GetTypename returns SimpleNamedFragmentRandomItemVideo.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetTypename() string { return v.Typename }
|
||||
|
||||
// GetId returns SimpleNamedFragmentRandomItemVideo.Id, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetName returns SimpleNamedFragmentRandomItemVideo.Name, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetName() string { return v.Name }
|
||||
|
||||
// GetUrl returns SimpleNamedFragmentRandomItemVideo.Url, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetUrl() string { return v.VideoFields.Url }
|
||||
|
||||
// GetDuration returns SimpleNamedFragmentRandomItemVideo.Duration, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetDuration() int { return v.VideoFields.Duration }
|
||||
|
||||
// GetThumbnail returns SimpleNamedFragmentRandomItemVideo.Thumbnail, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) GetThumbnail() VideoFieldsThumbnail {
|
||||
return v.VideoFields.Thumbnail
|
||||
}
|
||||
|
||||
func (v *SimpleNamedFragmentRandomItemVideo) UnmarshalJSON(b []byte) error {
|
||||
|
||||
if string(b) == "null" {
|
||||
@@ -229,6 +238,9 @@ type SimpleNamedFragmentRandomLeafArticle struct {
|
||||
Typename string `json:"__typename"`
|
||||
}
|
||||
|
||||
// GetTypename returns SimpleNamedFragmentRandomLeafArticle.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomLeafArticle) GetTypename() string { return v.Typename }
|
||||
|
||||
// SimpleNamedFragmentRandomLeafLeafContent includes the requested fields of the GraphQL interface LeafContent.
|
||||
//
|
||||
// SimpleNamedFragmentRandomLeafLeafContent is implemented by the following types:
|
||||
@@ -245,16 +257,9 @@ type SimpleNamedFragmentRandomLeafLeafContent interface {
|
||||
|
||||
func (v *SimpleNamedFragmentRandomLeafArticle) implementsGraphQLInterfaceSimpleNamedFragmentRandomLeafLeafContent() {
|
||||
}
|
||||
|
||||
// GetTypename is a part of, and documented with, the interface SimpleNamedFragmentRandomLeafLeafContent.
|
||||
func (v *SimpleNamedFragmentRandomLeafArticle) GetTypename() string { return v.Typename }
|
||||
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) implementsGraphQLInterfaceSimpleNamedFragmentRandomLeafLeafContent() {
|
||||
}
|
||||
|
||||
// GetTypename is a part of, and documented with, the interface SimpleNamedFragmentRandomLeafLeafContent.
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) GetTypename() string { return v.Typename }
|
||||
|
||||
func __unmarshalSimpleNamedFragmentRandomLeafLeafContent(b []byte, v *SimpleNamedFragmentRandomLeafLeafContent) error {
|
||||
if string(b) == "null" {
|
||||
return nil
|
||||
@@ -322,6 +327,26 @@ type SimpleNamedFragmentRandomLeafVideo struct {
|
||||
VideoFields `json:"-"`
|
||||
}
|
||||
|
||||
// GetTypename returns SimpleNamedFragmentRandomLeafVideo.Typename, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) GetTypename() string { return v.Typename }
|
||||
|
||||
// GetId returns SimpleNamedFragmentRandomLeafVideo.Id, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) GetId() testutil.ID { return v.VideoFields.Id }
|
||||
|
||||
// GetName returns SimpleNamedFragmentRandomLeafVideo.Name, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) GetName() string { return v.VideoFields.Name }
|
||||
|
||||
// GetUrl returns SimpleNamedFragmentRandomLeafVideo.Url, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) GetUrl() string { return v.VideoFields.Url }
|
||||
|
||||
// GetDuration returns SimpleNamedFragmentRandomLeafVideo.Duration, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) GetDuration() int { return v.VideoFields.Duration }
|
||||
|
||||
// GetThumbnail returns SimpleNamedFragmentRandomLeafVideo.Thumbnail, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) GetThumbnail() VideoFieldsThumbnail {
|
||||
return v.VideoFields.Thumbnail
|
||||
}
|
||||
|
||||
func (v *SimpleNamedFragmentRandomLeafVideo) UnmarshalJSON(b []byte) error {
|
||||
|
||||
if string(b) == "null" {
|
||||
@@ -387,6 +412,16 @@ type SimpleNamedFragmentResponse struct {
|
||||
RandomLeaf SimpleNamedFragmentRandomLeafLeafContent `json:"-"`
|
||||
}
|
||||
|
||||
// GetRandomItem returns SimpleNamedFragmentResponse.RandomItem, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentResponse) GetRandomItem() SimpleNamedFragmentRandomItemContent {
|
||||
return v.RandomItem
|
||||
}
|
||||
|
||||
// GetRandomLeaf returns SimpleNamedFragmentResponse.RandomLeaf, and is useful for accessing the field via an interface.
|
||||
func (v *SimpleNamedFragmentResponse) GetRandomLeaf() SimpleNamedFragmentRandomLeafLeafContent {
|
||||
return v.RandomLeaf
|
||||
}
|
||||
|
||||
func (v *SimpleNamedFragmentResponse) UnmarshalJSON(b []byte) error {
|
||||
|
||||
if string(b) == "null" {
|
||||
@@ -488,11 +523,29 @@ type VideoFields struct {
|
||||
Thumbnail VideoFieldsThumbnail `json:"thumbnail"`
|
||||
}
|
||||
|
||||
// GetId returns VideoFields.Id, and is useful for accessing the field via an interface.
|
||||
func (v *VideoFields) GetId() testutil.ID { return v.Id }
|
||||
|
||||
// GetName returns VideoFields.Name, and is useful for accessing the field via an interface.
|
||||
func (v *VideoFields) GetName() string { return v.Name }
|
||||
|
||||
// GetUrl returns VideoFields.Url, and is useful for accessing the field via an interface.
|
||||
func (v *VideoFields) GetUrl() string { return v.Url }
|
||||
|
||||
// GetDuration returns VideoFields.Duration, and is useful for accessing the field via an interface.
|
||||
func (v *VideoFields) GetDuration() int { return v.Duration }
|
||||
|
||||
// GetThumbnail returns VideoFields.Thumbnail, and is useful for accessing the field via an interface.
|
||||
func (v *VideoFields) GetThumbnail() VideoFieldsThumbnail { return v.Thumbnail }
|
||||
|
||||
// VideoFieldsThumbnail includes the requested fields of the GraphQL type Thumbnail.
|
||||
type VideoFieldsThumbnail struct {
|
||||
Id testutil.ID `json:"id"`
|
||||
}
|
||||
|
||||
// GetId returns VideoFieldsThumbnail.Id, and is useful for accessing the field via an interface.
|
||||
func (v *VideoFieldsThumbnail) GetId() testutil.ID { return v.Id }
|
||||
|
||||
func SimpleNamedFragment(
|
||||
client graphql.Client,
|
||||
) (*SimpleNamedFragmentResponse, error) {
|
||||
|
||||
Reference in New Issue
Block a user